分支前提交

components/s-video/res-s-video.vue

@@ -337,7 +337,7 @@
 		background-color: rgba(0, 0, 0, .35);
 	}
 
-	.animg {
+	.animg-start {
 		position: absolute;
 		top: 0;
 		left: 0;

components/s-video/s-video.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="video-wrapper" id="video-container">
 		<view class="marsk" @click="playVideo" v-if="showLayer">
-			<image class="animg" src="/static/images/start.png"></image>
+			<image class="animg-start" src="/static/images/start.png"></image>
 		</view>
 		<view style="position:relative;width:100%;" :style="{'height':videoHeight+'px'}">
 			<video id="video_play" @click="stopPlay" :src="videoObj.videoUrl" :controls="false" @ended="videoEnded()"
@@ -311,6 +311,7 @@
 				this.preQuestionId = this.videoObj.questionId;
 				// 直接自动开始播放
 				if (nodeId == 1) {
+					console.log(this.startNodeId)
 					this.nextQuestion(this.startNodeId, null)
 				}
 			},
@@ -344,7 +345,7 @@
 		background-color: rgba(0, 0, 0, .35);
 	}
 
-	.animg {
+	.animg-start {
 		position: absolute;
 		top: 0;
 		left: 0;

main.js

@@ -13,8 +13,9 @@ import * as filters from '@/utils/formatFilter'
 uni.$http = $http
 Vue.prototype.$api = api
 
-$http.baseUrl = 'http://146.56.223.227:9527'
-// $http.baseUrl = 'http://localhost:9527'
+// $http.baseUrl = 'http://146.56.223.227:85'
+   $http.baseUrl = 'https://civildrill.com:9528'
+// $http.baseUrl = 'http://localhost:85'
 
 $http.beforeRequest = function(options) {
 	uni.showLoading({

manifest.json

@@ -66,12 +66,21 @@
             "urlCheck" : false
         },
         "usingComponents" : true,
-		"permission": {
-			"scope.userLocation": {
-				"desc": "你的位置信息将用于小程序位置接口的效果展示"
-			}
-		},
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+            }
+        },
         "requiredPrivateInfos" : [ "getLocation", "onLocationChange", "chooseLocation", "chooseAddress" ]
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "h5" : {
+        "router" : {
+            "mode" : "hash",
+            "base" : "./"
+        },
+        "devServer" : {
+            "https" : false
+        }
+    }
 }

subpkg/list/list.vue

@@ -158,10 +158,11 @@
 					data: res
 				} = await uni.$http.post('/small/project/role/listAll',{sceneId: guid,name:""})
 				if (!res.success) return uni.$showMsg()
-			   console.log(res.data.length )
+			   console.log(res.data )
 			   if (res.data.length  === 1) {
 				  uni.navigateTo({
-				    url: '/subpkg/practice/practice?roleId='+res.data[0].roleId+'&sceneId='+guid
+				    // url: '/subpkg/practice/practice?roleId='+res.data[0].roleId+'&sceneId='+guid
+				    url: '/subpkg/practice/practice?roleId='+res.data[0].guid+'&sceneId='+guid
 				  })
 			   } else {
 				  uni.navigateTo({

utils/config.js

@@ -1,3 +1,4 @@
-let url_config = 'http://146.56.223.227:9527/'
-// let url_config = 'http://localhost:9527/'
+// let url_config = 'http://146.56.223.227:85/'
+   let url_config = 'https://civildrill.com:9528/'
+// let url_config = 'http://localhost:85/'
 export default url_config