11-18-1

manifest.json

@@ -2,8 +2,8 @@
     "name" : "精联惠选",
     "appid" : "__UNI__991D0D9",
     "description" : "精联惠选",
-    "versionName" : "1.0.9",
-    "versionCode" : 109,
+    "versionName" : "1.1.1",
+    "versionCode" : 111,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/index/index.vue

@@ -31,7 +31,12 @@
 		<!-- 分类 ed -->
 		<view class="jg">
 		</view>
+		<!-- #ifdef APP-PLUS -->
 		<video src="../../static/video/v1.mp4" controls class="gsjs" :muted="muted" ref="inv" id="myVideo"></video>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+		<video src="https://chat.yiqushangshi.com/wap/video/v1.mp4" controls class="gsjs" :muted="muted" ref="inv" id="myVideo"></video>
+		<!-- #endif -->
 		<!-- 商品列表 start -->
 		<!-- <view class="hot-wrap">
 			<view class="hot-top flex">

pages/index/zero.vue

@@ -10,10 +10,10 @@
 			<view class="line">
 			</view> -->
 			<view class="flex center-item" @click="navto('/pages/zero/gfz')">
-				<view class="val">
-					{{pUser.holding_value || 0}}
+				<view class="val" v-if="pUser.zero_level">
+					{{pUser.zero_level.name || 0}}
 				</view>
-				<view class="name">我的共富值</view>
+				<view class="name">我的持包值</view>
 			</view>
 			<view class="line">
 			</view>

pages/user/team.vue

@@ -48,6 +48,9 @@
 								<view class="title">
 									<view class="title-name clamp">{{ item.nickname }}</view>
 								</view>
+								<view class="flex star" v-if="item.zero_level >= 7">
+									<image src="../../static/icon/star.png" mode="" v-for="item in (item.zero_level*1 - 6)"></image>
+								</view>
 								<view class="time">
 									<text>{{ item.phone }}  ({{ showLevel(item)}})</text>
 								</view>
@@ -342,7 +345,7 @@
 
 			.list_tpl {
 				width: 85%;
-
+				
 				.title {
 					display: flex;
 					justify-content: flex-start;
@@ -389,6 +392,13 @@
 					font-size: $font-lg;
 					color: $font-color-light;
 				}
+				.star {
+					justify-content: flex-start;
+					image {
+						width: 36rpx;
+						height: 36rpx;
+					}
+				}
 			}
 		}
 

pages/zero/gfz.vue

@@ -8,7 +8,7 @@
 						{{pUser.holding_value}}
 					</view>
 					<view class="name">
-						个人共富值
+						联盟共富值
 					</view>
 				</view>
 				<view class="item">
@@ -16,7 +16,7 @@
 						{{pUser.trem_holding_value}}
 					</view>
 					<view class="">
-						联盟共富值
+						总共富值
 					</view>
 				</view>
 			</view>
@@ -25,6 +25,7 @@
 					当前等级：{{ pUser.zero_level ? pUser.zero_level.name:'暂无' }}
 				</view>
 				<view class="">
+					<!-- 总共富值：{{}} -->
 				</view>
 			</view>
 		</view>

pages/zero/gg.vue

@@ -3,8 +3,14 @@
 		<view class="djs">
 			观看完视频后，可获得奖励
 		</view>
+		<!-- #ifdef APP-PLUS -->
 		<video src="../../static/video/v1.mp4" class="gsjs" autoplay :muted="muted" :controls="false"
 			:enable-progress-gesture="false" @play="vPlay" ref="vgg" @ended="vEnd" id="myVideo"></video>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+		<video src="https://chat.yiqushangshi.com/wap/video/v1.mp4" class="gsjs" autoplay :muted="muted" :controls="false"
+			:enable-progress-gesture="false" @play="vPlay" ref="vgg" @ended="vEnd" id="myVideo"></video>
+		<!-- #endif -->
 	</view>
 </template>