幸运购修改4

taiyuan
1 parent 55d2a0bb
Showing 11 changed files with 186 additions and 93 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.json
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml
packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss
packageC/pages/luckyGo/luckyGo_members/luckyGo_members.json
packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.wxss
@@ -102,7 +102,7 @@ Page({
 		//先获取物流，再获取用户信息，再展示页面
-		th.get_wuliu(th.get_info(th.show_page));
+		this.get_wuliu(th.get_info(th.show_page));
 	},
 	onUnload: function() {
@@ -580,18 +580,24 @@ Page({
 	// 提交订单前弹出确认对话框
 	submitConfirm(e) {
-		wx.showModal({
-			title: '温馨提示',
-			content: this.data.param.alert,
-			success(res) {
-				if (res.confirm) {
-					console.log('用户点击确定');
-					self.submitForm(e);
-				} else if (res.cancel) {
-					console.log('用户点击取消');
+		// is_show为0不显示温馨提示，为1显示温馨提示
+		if(this.data.param.is_show == 1) {
+			wx.showModal({
+				title: '温馨提示',
+				content: this.data.param.alert,
+				success(res) {
+					if (res.confirm) {
+						console.log('用户点击确定');
+						self.submitForm(e);
+					} else if (res.cancel) {
+						console.log('用户点击取消');
+					}
 				}
-			}
-		})
+			});
+		} else {
+			this.submitForm(e);
+		};
+		
 	},
 {
-    "navigationBarTitleText": "填写订单",
+    "navigationBarTitleText": "提交订单",
     "enablePullDownRefresh": false,
     "usingComponents": {
         "warn": "/components/long_warn/long_warn"
@@ -9,6 +9,8 @@ var t = require(&quot;../../../../utils/util.js&quot;),
   o = s.globalData.setting,
   os = o;
   var regeneratorRuntime = require('../../../../utils/runtime.js');
+	
+let self = null;
 Page({
   data: {
@@ -48,8 +50,13 @@ Page({
 		showRules: false,
 		isSuccess: false,
 		showPoster: false,
+		
+		luckyGoMembers: [],
+		team_id: 0,
   },
+	
   onLoad: function (t) {
+		self = this;
 			if(t.team_id != null && t.team_id !=undefined) {
 				this.setData({
 					team_id: t.team_id,
@@ -71,7 +78,7 @@ Page({
       this.init(order_sn);
 	  //-- 自定义海报 --
-	  getApp().request.promiseGet("/api/weshop/goods/poster/page",{	
+	  getApp().request.promiseGet("/api/weshop/goods/poster/page", {	
 	  	data:{store_id:os.stoid, type:1, is_use:1 }
 	  }).then(res=>{
 	  	if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){
@@ -110,6 +117,11 @@ Page({
 		if(this.data.luckyGoInfo.num && this.data.luckyGoInfo.num == 0) {
 			wx.removeStorageSync('team_id');
 		};
+		// 如果是从会员中心的幸运购列表点击进来的,退出时清除storage里的team_id
+		if(this.data.param.from == 1) {
+			let team_id = wx.getStorageSync('team_id');
+			if(team_id != null && team_id != undefined) wx.removeStorageSync('team_id');
+		};
 	},
   //关闭展开列表
@@ -169,7 +181,7 @@ Page({
         pt_listno = "",//团编号
         pt_prom_id = 0, //活动id
         ee = this,
-        team_id = 0,//活动id
+        //team_id = 0,//活动id
         ordertx=[],//头像图片
         share_img=null,//分享图片
         teamlist=null,//活动表
@@ -964,14 +976,14 @@ Page({
         if (pagePath.indexOf('/') != 0) {
             pagePath = '/' + pagePath;
         }
-        if(getApp().globalData.user_id){
+        // if(getApp().globalData.user_id){
-            if(pagePath.indexOf("?")>0){
-                pagePath+="&first_leader="+getApp().globalData.user_id;
-            }else{
-                pagePath+="?first_leader="+getApp().globalData.user_id;
-            }
-        }
+        //     if(pagePath.indexOf("?")>0){
+        //         pagePath+="&first_leader="+getApp().globalData.user_id;
+        //     }else{
+        //         pagePath+="?first_leader="+getApp().globalData.user_id;
+        //     }
+        // }
         return {
             title: "邀你一起参加幸运购",
             path: pagePath,
@@ -1146,30 +1158,49 @@ Page({
 					id: this.data.param.group_id,
 				}
 			}).then(res => {
-			  var luckyGoInfo = res.data.data.pageData[0];
-				var team_id = luckyGoInfo.team_id;
-
-				th.setData({
-					luckyGoInfo,
-					team_id,
-				});
-				
-				//参团成功后,检查team_id
-				//如果team_id为0, 表示当前已开启新的一期，文字提示应改为’参团成功，本期幸运购已开团，中奖结果可点击下方查看参团列表‘
-				//如果team_id为0，取出之前保存的team_id替换掉，请求上一期已成团的幸运购活动
-				if(team_id != 0) {
-					wx.setStorage({
-					  key: 'team_id',
-					  data: team_id,
-					});
-				} else {
-					let team_id = wx.getStorageSync('team_id');
+				if(res.data.code == 0) {
+					console.log('当前成团信息', res);
+					var luckyGoInfo = res.data.data.pageData[0];
+					var team_id;
+					
+					if(th.data.param.from == 1) {
+						team_id = th.data.team_id;
+					} else {
+						team_id = luckyGoInfo.team_id;
+					};
+					
 					th.setData({
-						team_id: team_id,
-						isSuccess: true,
+						luckyGoInfo,
+						team_id,
 					});
+					
+					//参团成功后,检查team_id
+					//如果team_id为0, 表示当前已开启新的一期，文字提示应改为’参团成功，本期幸运购已开团，中奖结果可点击下方查看参团列表‘
+					//如果team_id为0，取出之前保存的team_id替换掉，请求上一期已成团的幸运购活动
+					//如果从会员中心的幸运购列表邀请好友点击进来，不执行storage操作
+					if(th.data.param.from == 1) return false;
+					if(team_id != 0) {
+						wx.setStorage({
+						  key: 'team_id',
+						  data: team_id,
+						});
+						console.log('存储team_id', team_id);
+					} else {
+						let team_id2 = wx.getStorageSync('team_id');
+						console.log('获取team_id', team_id2);
+						th.setData({
+							team_id: team_id2,
+							// isSuccess: true,
+						});
+					};
+					
+					// th.setData({
+					// 	luckyGoInfo,
+					// 	team_id,
+					// });
+					
 				};
-
+				
 			});
 			// 幸运购成团成员
@@ -1179,12 +1210,34 @@ Page({
 					team_id: this.data.team_id,
 				}
 			}).then(res => {
-				th.setData({
-					luckyGoMembers: res.data.data.pageData,
-				});
+				if(res.data.code == 0) {
+					console.log('当前参团成员', res, );
+					let myId = getApp().globalData.userInfo.user_id;
+					let luckyGoMembers = res.data.data.pageData;
+					th.setData({
+						luckyGoMembers,
+					});
+					
+					self.isMe(myId, luckyGoMembers);
+				};
+				
 			});
 		},
+		
+		// 判断自己是否中奖
+		isMe(myId, list) {
+			list.some((item, index) => {
+				if(item.team_status == 2) {
+					if(item.user_id == myId) {
+						self.setData({
+							iWin: true
+						});
+						return true;
+					};
+				}
+			});
+		},
@@ -4,7 +4,8 @@
   <view class="flex pd20 bg-white">
-    <view class="img-container shrink0" data-content="已团{{luckyGoInfo.group_joined}}件">
+		<!-- <view class="img-container shrink0" data-content="已团{{luckyGoInfo.group_joined}}件"> -->
+    <view class="img-container shrink0" data-content="">
       <image class="img-block" src="{{iurl + luckyGoInfo.original_img}}" data-val="{{luckyGoInfo.original_img}}"
       	data-errorimg="luckyGoInfo.original_img" binderror="bind_bnerr" lazy-load="true"></image>
     </view>
@@ -24,8 +25,9 @@
         </view>
         <view class="xc-wc fs24">
           <view>
-            <!-- <view class="">已拼{{teamlist.buy_num}}DDD件</view> -->
-						<view class="t-c">待成团</view>
+            <!-- luckyGoMembers.create_time 为0，表示还没开团 -->
+						<view class="t-c" wx:if="{{luckyGoMembers[0].create_time > 0}}">已成团</view>
+						<view class="t-c" wx:else>待成团</view>
             <view class="flex xc-valframe t-c">
               <view class="xc-frame-img">
                 <image class="picture" src="{{iurl}}/miniapp/images/bai-ren.png"></image>
@@ -43,7 +45,7 @@
   <view class="mgt20 bg-white pr">
 		<view class="rules fs24" bindtap="showRules">规则 <text class="iconfont icon-arrow_right fs24"></text></view>
     <!-- 阶梯团 -->
-    <view class='bodytop' wx:if="{{teamlist.kttype==3&& p_status==1}}">
+    <!-- <view class='bodytop' wx:if="{{teamlist.kttype==3&& p_status==1}}">
       当前价格
       <text class="xc-wc">¥{{ct_price}}</text>, 
       <block  wx:if="{{max_num-ordertx.length>0}}">
@@ -52,11 +54,11 @@
       <block wx:else>
         该团已经拼购到最低价了哦~
       </block>
-    </view>
+    </view> -->
     <!-- 拼团成功 -->
-    <view class="xc-ptcomplete-ladder flex-level fs28" wx:if="{{teamlist.kttype==3&&p_status==2}}">
+    <!-- <view class="xc-ptcomplete-ladder flex-level fs28" wx:if="{{teamlist.kttype==3&&p_status==2}}">
       <view class="xc-wc">拼团成功</view>,当前价格
       <text class="xc-wc">￥{{ct_price}}</text>
       <view class="xc-img-frame oh">
@@ -64,20 +66,26 @@
       </view>
     </view>
-    <view style="height: 20rpx" wx:if="{{teamlist.kttype==3&&p_status==4}}"></view>
+    <view style="height: 20rpx" wx:if="{{teamlist.kttype==3&&p_status==4}}"></view> -->
     <!-- 阶梯团失败 -->
 		<!-- <view class="pdt50 pdb30 pdh20" wx:if="{{pay_f==1 || order.pt_status==3}}"> -->
     <view class="pdt50 pdb30 pdh20">
 			<block wx:if="{{team_id != 0}}">
-				<view class="fs28 t-c" wx:if="{{!isSuccess}}">参团成功，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人即可成团，请留意成员开奖通知！</view>
-				<view class="fs28 t-c" wx:else>参团成功，本期幸运购已开团！</view>
+				<view class="fs28 t-c" wx:if="{{luckyGoMembers[0].create_time > 0}}">
+					<view>参团成功，本期幸运购已开团！</view>
+					<view class="fs26 t-c c-red">{{iWin ? '恭喜您团中该商品，请等待商家发货~':'很遗憾您未团中，可获得一份帮团奖励，再接再厉噢~'}}</view>
+				</view>
+				<view class="fs28 t-c" wx:else>您已参团成功，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人参与即可成团！</view>
 			</block>
+			
       <block wx:if="{{team_id == 0 && param.from}}">
 				<view class="fs28 t-c">组团中，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人即可成团！</view>
 			</block>
-			<view class="fs24 t-c c-red">未团中可获得帮团奖励</view>
+			
+			<!-- <view class="fs26 t-c c-red">快去邀请小伙伴一起参与吧~</view> -->
+			
       <!-- <view class="xc-img-frame oh" >
         <image class="img" src="{{iurl}}/miniapp/images/xc-qtshibai.png"></image>
       </view> -->
@@ -85,16 +93,16 @@
     <!-- 拼团成功 -->
-    <view class="xc-ptcomplete flex-level fs28" wx:if="{{p_status==2 && (teamlist.kttype==2||teamlist.kttype==1)}}">
+    <!-- <view class="xc-ptcomplete flex-level fs28" wx:if="{{p_status==2 && (teamlist.kttype==2||teamlist.kttype==1)}}">
       <view class="xc-wc">拼团成功</view>,为您节省
       <text class="xc-wc">{{filters.toFix(goods.market_price-teamlist.price,2)}}</text>元
       <view class="xc-img-frame oh">
         <image class="img" src="{{iurl}}/miniapp/images/xc_qtcg.png"></image>
       </view>
     </view>
-		<view></view>
+		<view></view> -->
     <!----//// //头像---->
-    <view class="flex_tou pdv30">
+    <view class="flex_tou pdv20">
       <view class="flex jc-center">
 				<view class="d" wx:if="{{team_id == 0 && param.from}}">
 				  <image  class="img-block" src='{{iurl}}/miniapp/images/shafa.png'></image>
@@ -166,7 +174,7 @@
     <view class='fs30 xc-green' wx:if='{{teamlist.kttype==3&&p_status==2}}'>
       拼团成功, 规定时间内支付尾款即发货
     </view>
-    <view class="xc-wc fs30 t-c xc-onclik" wx:if="{{p_status==1}}">
+    <view class="xc-wc fs30 t-c xc-onclik" wx:if="{{!(luckyGoMembers[0].create_time > 0)}}">
       点击下方按钮分享给小伙伴,可快速成团！
     </view>
@@ -192,11 +200,11 @@
       <!-- </view> -->
     <!-- </block> -->
     <view class="flex jc-center ai-center fs26" hidden="{{hiddenName}}" bindtap="click">
-			查看拼团列表<text class="down-arrow1"></text>
+			查看参团成员<text class="down-arrow1"></text>
 		</view>
 		<view class='bodyfoot'>
-		  <view class="fs26" wx:if="{{zk}}" bindtap="czk">查看拼团列表<view class='down-arrow'></view></view>
+		  <view class="fs26" wx:if="{{zk}}" bindtap="czk">查看参团成员<view class='down-arrow'></view></view>
 			<!-- {{ordertx}} -->
 		  <view class="flex ai-center jc_sb pdh30 pdv20 fs26" hidden="{{hiddenName}}" wx:for="{{luckyGoMembers}}" wx:for-index="ky">
@@ -233,7 +241,7 @@
 			<view class="pdh20 f1">
 				<button class="btn-red pdh20 fs24" bindtap="gohome">返回首页</button>
 			</view>
-			<view class="pdh20 f1">
+			<view class="pdh20 f1" wx:if="{{!(luckyGoMembers[0].create_time > 0)}}">
 				<button class="btn-yellow pdh20 fs24" bindtap="clickShare">邀请好友参团</button>
 			</view>
 		 <!-- <button class="btn-red pdh20 fs24" bindtap="gohome">返回首页</button>
@@ -275,6 +275,7 @@ Page({
 		luckGoInfo: {},
 		showDetails: false,
+		num_success: 0, //成团已中商品数量
   },
@@ -308,22 +309,7 @@ Page({
       }
-			// 检查是否已经购买参团
-			getApp().request.get("/api/weshop/prom/luckyOrder/getUserOrderInfo/" + o.stoid + "/" + oo.user_id + "/" + prom_id, {
-				success: function(res) {
-					console.log('505=====>', res.data.data);
-					if(res.data.code == 0) {
-						th.setData({
-							showDetails: true,
-							buyInfo: res.data.data,
-						});
-					} else {
-						th.setData({
-							showDetails: false,
-						});
-					};
-				}
-			});
+			
 			// api/weshop/prom/luckyOrder/getUserOrderInfo/{store_id}/{user_id}/{aid}
 			// getApp().request.promiseGet("/api/weshop/pickup/list", {
 			//   data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon,is_pos:1 },
@@ -1020,6 +1006,24 @@ Page({
     this.data.enterAddressPage && (this.data.enterAddressPage = !1);
+		// 检查是否已经参团购买
+		getApp().request.get("/api/weshop/prom/luckyOrder/getUserOrderInfo/" + o.stoid + "/" + oo.user_id + "/" + this.data.prom_id, {
+			success: function(res) {
+				console.log('当前幸运购活动是否已经参团', res.data.code);
+				// if(res.data.code == 0) {
+				// 	th.setData({
+				// 		showDetails: true,
+				// 		buyInfo: res.data.data,
+				// 	});
+				// } else {
+				// 	th.setData({
+				// 		showDetails: false,
+				// 	});
+				// };
+			}
+		});
+		
+
 		//获取单个活动已成团数量
 		getApp().request.get(`/api/weshop/prom/luckyTeam/getCtNum/${o.stoid}/${this.data.group_id}`, {
 		  success: function (res) {
@@ -1049,6 +1053,20 @@ Page({
 		});
+		//获取单个活动成团已中商品数量
+		let url_num_success = `/api/weshop/prom/luckyOrder/countActNum/${os.stoid}/${this.data.group_id}`;
+		getApp().request.get(url_num_success, {
+		  success: function (res) {
+				if (res.data.code == 0) {
+					console.log('成团已中商品数量汇总',res.data.data);
+					th.setData({
+						num_success: res.data.data,
+					});
+				}
+			}
+		});
+						
+		
 		//获取单个活动成团信息
 		await getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', {
 			data: {
@@ -3791,6 +3809,7 @@ Page({
   },
   //--点击弹起拼单--
+	// ind == 1 为普通购买
   openSpecModel_pt: function (e) {
     this.setData({ open_ind_store: 9, goodsInputNum: 1 });
@@ -3898,6 +3917,9 @@ Page({
   //-----------------拼单生成方法---------------------
   addCart_pt: function () {
+		this.setData({
+			openSpecModal_pt: 0,
+		});
     if (this.data.is_normal == 0) {
       //看一下有没有起购数，如果有起购数，要计算起购数
       // var qnum = parseFloat(th.data.prom_act.minbuynum);
@@ -4094,7 +4116,7 @@ Page({
   buyNow_pt: function (e) {
     s.set_b_now(e);
     wx.navigateTo({
-      url: "/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct?is_bnow=1&group_id=" + this.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + this.data.luckGoInfo.lc_alert + '&goods_price=' + this.data.luckGoInfo.group_price/100,
+      url: "/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct?is_bnow=1&group_id=" + this.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + this.data.luckGoInfo.lc_alert + '&goods_price=' + this.data.luckGoInfo.group_price/100 + '&is_show=' + this.data.luckGoInfo.is_show,
     });
 		// getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&group_id=" + th.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + th.data.luckGoInfo.lc_alert);
 {
-    "navigationBarTitleText": "商品详情2",
+    "navigationBarTitleText": "",
     "enablePullDownRefresh": false,
     "usingComponents": {
         "nav_box": "/components/nav_box/nav_box",
@@ -29,8 +29,8 @@
 									<image src="{{item.head_pic}}" class="img-block"></image>
 								</view>
 								<view class="flex ai_c pd10">
-									<view class="nickname ellipsis-1x">恭喜{{item.nickname}}</view>
-									<view style="flex-shrink: 0;">获得了"{{item.goods_name}}"</view>
+									<view class="nickname ellipsis-1x">恭喜{{item.nickname}}获得了{{item.goods_name}}</view>
+									<!-- <view style="flex-shrink: 0;"></view> -->
 								</view>
 							</view>
 						</swiper-item>
@@ -273,7 +273,7 @@
             <view class="goods-num">
-							<view class="sales">已售：{{data.sales_sum}}件</view>
+							<view class="sales">已售：{{num_success}}件</view>
               <!-- <view class="sales">销量：{{data.sales_sum}}件</view> -->
               <!-- <view class="stock">折扣：{{data.disc}}折</view> -->
               <view class="stock">{{categories3[0].num}}人评价</view>
@@ -1253,9 +1253,10 @@
   </view>
 </view>
 <!-- 弹起来,购买积分购 -->
-<view hidden="{{!openSpecModal_inte}}">
+<!-- <view hidden="{{!openSpecModal_inte}}">
   <include src="buy_integral.wxml" />
-</view>
+</view> -->
+
 <!-- 弹起来,购买积分购的普通购买 -->
 <!-- <view hidden="{{!openSpecModal_inte_normal}}">
   <include src="buy_integral_normal.wxml" />
@@ -1264,6 +1265,8 @@
 <view hidden="{{!openSpecModal_pt}}">
   <include src="buy_pt.wxml" />
 </view>
+
+
 <!-- --弹起来优惠信息---- -->
 <!-- <view hidden="{{!openPromModal}}">
   <view bindtap="closePromModal" class="cover-layer"></view>
@@ -9,6 +9,7 @@
 		<view class="list-item" wx:for="{{list.pageData}}">
 		<!-- <view class="list-item" wx:for="{{list.pageData}}"> -->
 			<view class="pd20" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}">
+				<!-- <view class="fs28">{{item.act_name}} (第{{item.team_sn}}期) </view> -->
 				<view class="pdr40 arrow" wx:if="{{item.team_status == 0}}">参团中，还差<text class="c-red">{{filters.difference(item.num, item.group_num)}}</text>人</view>
 				<view class="pdr40 arrow" wx:elif="{{item.team_status == 2}}">已团中，{{item.shipping_status == 0 ? '待发货':'已发货'}}</view>
 				<view class="pdr40 arrow" wx:elif="{{item.team_status == 1}}">未团中，已退款</view>
@@ -31,7 +32,7 @@
 				<view>共1件，实付金额：<text class="rmb">{{item.user_money}}</text></view>
 				<view class="flex">
 					<view class="btn gray" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&team_status={{item.team_status}}">查看订单</view>
-					<view class="btn c-red mgl20" wx:if="{{item.team_status == 0}}" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{item.aid}}&goods_id={{item.goods_id}}&goods_name={{item.goods_name}}&team_id={{item.team_id}}&&from=list">邀请好友</view>
+					<view class="btn c-red mgl20" wx:if="{{item.team_status == 0}}" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{item.aid}}&goods_id={{item.goods_id}}&goods_name={{item.goods_name}}&team_id={{item.team_id}}&&from=1">邀请好友</view>
 					<view class="btn c-red mgl20" wx:if="{{item.team_status == 1}}" bindtap="showReward" data-index="{{index}}" data-aid="{{item.aid}}">查看奖励</view>
 				</view>
 			</view>
@@ -49,7 +49,7 @@ page {
 }
 .title {
-	height: 88rpx;
+	/* max-height: 88rpx; */
 }
 .tab-bd {
 {
-	"navigationBarTitleText": "参团成员",
+	"navigationBarTitleText": "本期参团成员",
 	"enablePullDownRefresh": false,
   "usingComponents": {}
 }
 \ No newline at end of file
@@ -8,11 +8,11 @@ page {
 }
 .img-container {
-	width: 60rpx;
-	height: 60rpx;
+	width: 80rpx;
+	height: 80rpx;
 	border-radius: 50%;
 	overflow: hidden;
-	margin-right: 10rpx;
+	margin-right: 20rpx;
 	flex-shrink: 0;
 }
@@ -32,7 +32,7 @@ page {
 	display: flex;
 	align-items: center;
 	text-align: center;
-	font-size: 26rpx;
+	font-size: 28rpx;
 }
 .list-hd {