edit

App.vue

@@ -50,10 +50,10 @@ export default {
 </script>
 <style lang="scss">
 /*每个页面公共css */
-@import '@/static/styles/app.scss';
+@import './static/styles/app.scss';
 </style>
 <style>
-@import '@/static/layer/theme/default/layer.css';
+@import './static/layer/theme/default/layer.css';
 @import './lib/colorui/main.css';
 @import './lib/colorui/icon.css';
 @import './lib/colorui/animation.css';

lib/dever/components/video.nvue

@@ -3,7 +3,7 @@
 		<view class="player">
 			<video
 				:src="src"
-				preload
+				preload="auto"
 				:initial-time="initial_time"
 				:autoplay="false"
 				:show-mute-btn="true"
@@ -18,7 +18,9 @@
 				play-btn-position="center"
 				class="video"
 				:playsinline="true"
-				:webkit-playsinline="true"
+				:webkit-playsinline="true"
+				:x5-video-player-fullscreen="true"
+				:x5-playsinline="true"
 				x-webkit-airplay="allow"
 				x5-video-player-type="h5-page"
 				:page-gesture="false"
@@ -164,6 +166,13 @@ export default {
 			this.play = true;
 			this.playButton = true;
 			this.muted = false;
+		},
+		autoStart : function() {
+			//h5下无法自动播放，这里考虑使用先静音播放
+			this.muted = false;
+			this.video.play();
+			//this.video.currentTime = 0;
+			//this.video.pause();
 		},
 		start : function()  {
 			if (this.disabled) {

manifest.json

@@ -2,8 +2,8 @@
     "name" : "合小记",
     "appid" : "__UNI__10C3233",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.1.0",
+    "versionCode" : 110,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -17,7 +17,9 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Contacts" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -52,7 +54,10 @@
                 "UIBackgroundModes" : "audio,location"
             },
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "maps" : {},
+                "oauth" : {}
+            }
         },
         "uniStatistics" : {
             "enable" : true
@@ -62,12 +67,16 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx6f582b09daa468fa",
         "setting" : {
             "urlCheck" : false
         },
         "usingComponents" : true,
-        "permission" : {},
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取用户位置"
+            }
+        },
         "uniStatistics" : {
             "enable" : true
         }
@@ -111,9 +120,8 @@
             "treeShaking" : {
                 "enable" : true
             },
-			"prefetch" : true,
-			"preload" : true
-			
+            "prefetch" : false,
+            "preload" : false
         },
         "template" : "index.html"
     },

pages/dream/func/share.vue

@@ -47,12 +47,12 @@
 			
 			<button class="onSave" @click="showRes">
 				<view class="lg text-gray cuIcon-picfill" style="width:70rpx;height:70rpx"></view>
-				<text>素材</text>
+				<text>图片</text>
 			</button>
 			
 			<button class="onSave" @click="showPoster">
 				<view class="lg text-gray cuIcon-btn" style="width:70rpx;height:70rpx"></view>
-				<text>海报</text>
+				<text>合成</text>
 			</button>
 		</view>
 

pages/dream/view/pic.vue

@@ -1,7 +1,12 @@
 <template name="pic">
 	<view class="cover cover-height">
-		<image @load="loadImg" @click="Dever.viewPic([item.pic], item.pic)" :src="item.pic" mode="widthFix" :class="['default', 'slide-image', 'slide-image-'+item.type]"  style="height:auto"></image>
-		<dever-position :item="item.text" :down="item.pic" :button="item.is_button"></dever-position>
+		<block v-if="item.text.length > 0">
+			<image @click="Dever.viewPic([item.pic], item.pic)" :src="item.pic" mode="widthFix" :class="['default', 'slide-image', 'slide-image-'+item.type]"  style="height:auto"></image>
+			<dever-position :item="item.text" :down="item.pic" :button="item.is_button"></dever-position>
+		</block>
+		<block v-if="item.text.length <= 0">
+			<image @load="loadImg" @click="Dever.viewPic([item.pic], item.pic)" :src="item.pic" mode="widthFix" :class="['default', 'slide-image', 'slide-image-'+item.type]"  style="height:auto"></image>
+		</block>
 	</view>
 </template>
 

pages/dream/view/vodShort.vue

@@ -49,8 +49,14 @@ export default {
 		this.control[this.index] = this;
 	},
 	methods:{
-		start : function() {
-			this.$refs.video[this.current_index].start();
+		start : function() {
+			for(var i in this.$refs.video) {
+				if (this.current_index == i) {
+					this.$refs.video[this.current_index].start();
+				} else {
+					this.$refs.video[i].autoStart();
+				}
+			}
 		},
 		stop : function() {
 			this.$refs.video[this.current_index].stop(true);