自定义模板的优化

yvan.ni
1 parent a03b724a
Showing 8 changed files with 560 additions and 394 deletions
components/diy_user_info/diy_user_info.wxss
components/diy_user_info/style3.wxml
components/diy_user_order/diy_user_order.js
components/diy_user_tools_services/diy_user_tools_services.js
packageG/pages/user_template/index.json
pages/user/index/index.js
pages/user/index/index.json
pages/user/index/index.wxml
@@ -37,7 +37,7 @@
  
 /*--  头部 --*/
 .xc-user .xc-head {
-  height: 370rpx;
+  height: 380rpx;
 }
  
 .xc-background {
@@ -218,3 +218,18 @@
   font-size: 27rpx;
   margin-top: 25rpx;
 }
+
+.gr_box {
+  position: relative;
+  height: 16rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+  overflow: hidden;
+}
+.gr_box_item{
+  height: 16rpx;
+  width: 100px;
+  background-color: #999;
+}
+
+
 <!-- 会员有登陆登陆的情况 -->
-<view class="xc-user-frame abs" wx:if="{{userInfo}}" style="top:20rpx">
-
-
-
-    <view class="xc-uesr-name" style="color:{{object.word_color}}">
-        <view class="flex ai-center jc-center">
+<view class="xc-user-frame abs" wx:if="{{userInfo}}" style="width:700rpx;left:25rpx;top:32rpx">
+    <view class="xc-uesr-name" style="color:{{object.word_color}}" >
+        <view class="flex ai-center">
             <text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text>
-
-
         </view>
-        <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:4rpx" wx:if="{{qy_data &&  qy_data.is_init && qy_data.gradeId && object.is_cz}}" bindtap='jump'>
-            <block wx:if="{{qy_data.cz_val<qy_data.full_cz_val}}">
-                {{" "}}
-                <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text>
-                <view style='margin-left:5rpx; '>{{qy_data.cz_val}} / {{qy_data.need_money}}</view>
-            </block>
-            <block wx:else>
-                {{" "}}
-                <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text> {{cz_val}}
-            </block>
+        <view class="flex fs24 xc-grow-ups ai-center" style="margin-top:4rpx">
+            <view class="hvip" wx:if='{{qy_data && qy_data.GradeName && qy_data.is_init && object.is_qy}}' style="margin-right:6rpx">
+                <image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{qy_data.GradeName}}
+            </view>
+            <image bindtap='show_tc' class="xc-qrcode"  wx:if="{{userInfo && object.is_user_card}}"
+                   style="border: 5rpx solid #fe9db5;background: #fe9db5;width:40rpx; height:40rpx;" src="{{iurl}}/miniapp/images/qrcode1.png"></image>
         </view>
+
+        <!-- 显示成长值，综合分 -->
+        <block wx:if="{{qy_data &&  qy_data.is_init && qy_data.gradeId && object.is_cz}}">
+            <view class="fs22" style="margin-top:15rpx">距白金卡会员还有111</view>
+            <view class="gr_box" style="margin-top:10rpx">
+                <view class="gr_box_item"></view>
+            </view>
+        </block>
+
     </view>
  
 </view>
  
-
-<view  wx:else class="flex-space-between  abs xc-user-frame">
+<!-- 显示头像 -->
+<view  wx:else class="flex-space-between  abs xc-user-frame" >
     <!-- 会员没有登陆的情况 -->
     <view class="xc-user-left  flex" bindtap="login_user">
         <image class="xc-user-img  circle" src="{{defaultAvatar}}"></image>
@@ -34,9 +34,16 @@
 </view>
  
  
-<view wx:if="{{userInfo && object.is_user_card}}" class="xc-qrcode-frame abs ">
-    <image bindtap='show_tc' class=" xc-qrcode " style="border: 5rpx solid #fe9db5;background: #fe9db5;" src="{{iurl}}/miniapp/images/qrcode1.png"></image>
-    <view style="font-size:12px;color:{{object.word_color}}">会员卡</view>
+<view  class="xc-qrcode-frame abs" style="right:50rpx;top:38rpx">
+    <view style="position:relative;">
+        <image class="xc-user-img  circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
+        <block wx:if="{{pulscardname && sys_switch.rank_switch > 0 && object.is_plus }}">
+            <view data-url="/pages/user/plus/plus" catchtap="goto"  class="flex-center plusMax" style="bottom:-12rpx">
+                <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
+                <view>{{pulscardname}}</view>
+            </view>
+        </block>
+    </view>
 </view>
  
 <view class="flex-vertical abs xc-grow-frame rel" style="display: none">
@@ -16,7 +16,18 @@ Component({
     iurl:os.imghost,
   },
   methods: {
-    // 这里是一个自定义方法
-    customMethod() { }
+
+    //跳转到订单的优化
+    go_order: function (e) {
+      if (!getApp().globalData.user_id)
+      {
+        getApp().goto('/packageE/pages/togoin/togoin');
+        return false;
+      };
+      var url = e.currentTarget.dataset.url;
+      wx.navigateTo({
+        url: url,
+      })
+    },
   }
 })
 \ No newline at end of file
@@ -58,44 +58,8 @@ Component({
             th.setData({sys_switch: t_swi});
           }
         })
-
        let img_host=this.data.iurl;
-       if(this.properties.f_user_tool){
-           var f_user_tool=JSON.parse(JSON.stringify(this.properties.f_user_tool));
-           var list=this.properties.object.list;
-
-           if(list && list.length) {
-             //进行循环
-             for (let iu = 0; iu < list.length; iu++) {
-               let fd = f_user_tool.find(function (e) {
-                 return e.id == list[iu].id;
-               })
-               if (fd) {
-                 list[iu].icoimg = fd.icoimg;
-                 list[iu].new_weappurl = fd.new_weappurl;
-               } else {
-                 list.splice(iu, 1);
-                 iu--;
-               }
-             }
-           }else{
-             list=[];
-           }
-           //-- 如果是有新的tool要添加进去 --
-           for (let ig = 0; ig <f_user_tool.length ; ig++) {
-             let fd= list.find(function (e){
-               return e.id==f_user_tool[ig].id;
-             })
-             if(fd) continue;
-             let ob={
-               show:true,id:fd.id,icoimg:fd.icoimg,name:item.name,new_weappurl:item.new_weappurl
-             }
-             list.push(ob);
-           }
-
-
-           this.setData({user_tool:list})
-       }
+
   },
  
   methods: {
@@ -238,5 +202,49 @@ Component({
  
  
  
-  }
+  },
+
+  observers: {
+    // 监听 num1 和 num2 数据的变化
+    'f_user_tool': function(obj){
+      console.log(1111);
+      console.log(obj);
+      if(obj){
+        var f_user_tool=JSON.parse(JSON.stringify(obj));
+        var list=this.properties.object.list;
+
+        if(list && list.length) {
+          //进行循环
+          for (let iu = 0; iu < list.length; iu++) {
+            let fd = f_user_tool.find(function (e) {
+              return e.id == list[iu].id;
+            })
+            if (fd) {
+              list[iu].icoimg = fd.icoimg;
+              list[iu].new_weappurl = fd.new_weappurl;
+            } else {
+              list.splice(iu, 1);
+              iu--;
+            }
+          }
+        }else{
+          list=[];
+        }
+        //-- 如果是有新的tool要添加进去 --
+        for (let ig = 0; ig <f_user_tool.length ; ig++) {
+          let fd= list.find(function (e){
+            return e.id==f_user_tool[ig].id;
+          })
+          if(fd) continue;
+          let ob={
+            show:true,id:fd.id,icoimg:fd.icoimg,name:item.name,new_weappurl:item.new_weappurl
+          }
+          list.push(ob);
+        }
+
+
+        this.setData({user_tool:list})
+      }
+    }
+  },
 })
 \ No newline at end of file
@@ -8,7 +8,6 @@
         "diy_user_order":"/components/diy_user_order/diy_user_order",
         "diy_user_my_rights":"/components/diy_user_my_rights/diy_user_my_rights",
         "diy_user_tools_services":"/components/diy_user_tools_services/diy_user_tools_services",
-        "diy_user_my_rights": "/components/diy_user_my_rights/diy_user_my_rights",
         "com_top_nav": "/components/com_top_nav/com_top_nav",
         "goods_recommend": "/components/goods_list/goods_list"
     },
@@ -52,8 +52,9 @@ Page({
  
 		has_rj:0,
 		rfmName:'成长值',
-		is_close_chuzhi:0
+		is_close_chuzhi:0,
  
+		pshow:0
  
 	},
 	goto_nav: function (e) {
@@ -118,8 +119,11 @@ Page({
 	 */
 	onShow: function () {
  
+
 		var _that=this;
  
+		this.init_load()
+
 		//-- 看一下隐私政策要不要显示 --
 		var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
 		if (privacy_pop) {
@@ -200,7 +204,6 @@ Page({
  
 		if (e != undefined && e != null && e.mobile) {
  
-
 			if (e.card_field != '' && e.card_field != null && e.card_field != undefined && e.card_expiredate) {
 				var now = ut.gettimestamp();
 				var str = e.card_expiredate.replace(/-/g, '/');;
@@ -531,7 +534,7 @@ Page({
 			//自定义组件一定要等到页面加载完了，才来调用selectComponnent
 			setTimeout(function () {
  
-				th.setData({ is_show_recommend:true })
+				th.setData({ is_show_recommend:true,pshow:1 })
 				if (getApp().globalData.user_id) getApp().requestCardNum(th);
 				var goods_list = th.selectComponent("#goods_recommend"); //组件的id
  
@@ -540,13 +543,14 @@ Page({
 					goods_list.get_list();
 				}
  
-			}, 1000)
-		}
+			}, 1200)
  
  
  
+		}
  
   },
+
   //获取会员权益等级是否升级
   getVison(){
     let isRfm = wx.getStorageSync('isRfm')
@@ -1174,6 +1178,45 @@ Page({
 		});
 	},
  
+	//同步初始加载
+	async init_load() {
+		var th = this;
+		//因为营销版本的功能包含了自定义模板的功能，是同时的
+		//读取全局是否有弄自定义模板
+		await getApp().request.promiseGet("/api/weshop/store_module/gets/"+os.stoid+"/1/8", {1: 1}).then(res => {
+			var data = res.data.data;
+			if (data && data.length) {
+				var temp_data = data[0];
+				var t_arr = JSON.parse(temp_data.json_str);
+
+				let obj={
+					share_title: temp_data.page_title,
+					template_arr: t_arr,
+					isTemplate: 1,
+					bgcolor_t: temp_data.bkcolor,
+					pshow:1
+				};
+
+				//---如果有设定顶部的颜色的时候--
+				if (temp_data.top_color && temp_data.top_color != 'null') {
+					var top_w_color = "#ffffff";
+					if (temp_data.top_word_color) {
+						top_w_color = temp_data.top_word_color
+					}
+					wx.setNavigationBarColor({
+						frontColor: top_w_color, // 必写项
+						backgroundColor: temp_data.top_color, // 必写项
+					})
+					obj.topwColor=top_w_color;
+					obj.topbgColor=temp_data.top_color;
+				}
+
+				th.setData(obj);
+
+			}
+		})
+	},
+
  
  
  
@@ -3,7 +3,14 @@
     "pop_txt": "/components/userqy_pop_up/userqy_pop_up",
   	"goods_recommend": "/components/goods_list/goods_list",
     "privacy_pop": "/components/privacy_pop/privacy_pop",
-    "com_top_nav": "/components/com_top_nav/com_top_nav"
+    "com_top_nav": "/components/com_top_nav/com_top_nav",
+    "advertising":"/components/diy_advertising/diy_advertising",
+    "assist":"/components/diy_assist/diy_assist",
+    "diy_user_info":"/components/diy_user_info/diy_user_info",
+    "diy_user_order":"/components/diy_user_order/diy_user_order",
+    "diy_user_my_rights":"/components/diy_user_my_rights/diy_user_my_rights",
+    "diy_user_tools_services":"/components/diy_user_tools_services/diy_user_tools_services"
+
   },
   "navigationBarTitleText": "会员中心",
   "navigationStyle": "custom"
@@ -5,387 +5,463 @@
 <wxs src="filter.wxs" module="util"></wxs>
 <com_top_nav title="会员中心"></com_top_nav>
  
-<view class="xc-page" style="margin-bottom:{{isIpx ? '168rpx' : '100rpx'}}">
-  <view class="xc-user">
-    <view class="xc-head rel">
-      <image class="xc-background" src="{{iurl}}{{ad_img?ad_img:'/miniapp/images/user_index_powder.jpg'}}">
-        <view class="flex-space-between  abs xc-user-frame">
-          <view class="xc-user-left  flex" wx:if="{{userInfo}}">
-            <view style="position:relative;">
-              <image class="xc-user-img  circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
-              <block wx:if="{{pulscardname && sys_switch.rank_switch > 0 }}">
-                <view data-url="/pages/user/plus/plus" catchtap="goto"  class="flex-center plusMax">
-                  <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
-                  <view>{{pulscardname}}</view>
+
+
+<block wx:if="{{pshow}}">
+  <!-- 显示自定义模板 -->
+  <block wx:if="{{isTemplate}}">
+    <block wx:for="{{template_arr}}" wx:key="{{index}}">
+      <view>
+        <!--广告组合-->
+        <block wx:if="{{item.ename=='advertising'}}">
+          <advertising object="{{item.content}}"></advertising>
+        </block>
+        <!--辅助空白-->
+        <block wx:if="{{item.ename=='white'}}">
+          <assist object="{{item.content}}"></assist>
+        </block>
+        <!-- 会员信息 -->
+        <block wx:if="{{item.ename=='userinfo'}}">
+          <diy_user_info object="{{item.content}}"
+                         byquan="{{byquan}}" yuer="{{yuer}}" udata="{{udata}}"
+                         qy_data="{{qy_data}}" pulscardname="{{pulscardname}}"  rfmName="{{rfmName}}" ></diy_user_info>
+        </block>
+        <!-- 我的订单 -->
+        <block wx:if="{{item.ename=='order'}}">
+          <diy_user_order object="{{item.content}}" toji="{{toji}}" ></diy_user_order>
+        </block>
+        <!-- 我的权益 -->
+        <block wx:if="{{item.ename=='my_rights'}}">
+          <diy_user_my_rights object="{{item.content}}"  qy_data="{{qy_data}}" b_gift="{{b_gift}}" ></diy_user_my_rights>
+        </block>
+        <!-- 工具与服务 -->
+        <block wx:if="{{item.ename=='tools_services'}}">
+          <diy_user_tools_services object="{{item.content}}"  is_dengji="{{is_dengji}}"  qy_data="{{qy_data}}"
+                                   enableMeiye="{{enableMeiye}}"   f_user_tool="{{user_tool}}"  c_list="{{c_list}}"></diy_user_tools_services>
+        </block>
+
+      </view>
+    </block>
+
+    <!-- 显示推荐 -->
+    <view style='width:100%;height:73rpx;' wx:if="{{is_show_recommend}}">
+      <view class="xc-recommend-goods flex-center">
+
+        <view class="circle xc-small">
+        </view>
+        <view class="circle xc-zhong">
+        </view>
+        <view class="circle xc-big">
+        </view>
+        <view class="three-level-word xc-recommend">为你推荐</view>
+        <view class="circle xc-big">
+        </view>
+        <view class="circle xc-zhong">
+        </view>
+        <view class="circle xc-small" style='margin-left:15rpx;'>
+          <!-- </view> -->
+        </view>
+      </view>
+    </view>
+    <!-- 显示商品 -->
+    <!-- 好物推荐 -->
+    <block wx:if="{{is_show_recommend}}">
+      <goods_recommend id="goods_recommend"></goods_recommend>
+    </block>
+
+    <!-- 技术支持 -->
+    <view class="logo-container t-c">
+      <view class="flex ai_c fs24 jc-center pdv30 white">
+        <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持
+      </view>
+    </view>
+  </block>
+
+  <block wx:else>
+    <view class="xc-page" style="margin-bottom:{{isIpx ? '168rpx' : '100rpx'}}">
+      <view class="xc-user">
+        <view class="xc-head rel">
+          <image class="xc-background" src="{{iurl}}{{ad_img?ad_img:'/miniapp/images/user_index_powder.jpg'}}">
+            <view class="flex-space-between  abs xc-user-frame">
+              <view class="xc-user-left  flex" wx:if="{{userInfo}}">
+                <view style="position:relative;">
+                  <image class="xc-user-img  circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
+                  <block wx:if="{{pulscardname && sys_switch.rank_switch > 0 }}">
+                    <view data-url="/pages/user/plus/plus" catchtap="goto"  class="flex-center plusMax">
+                      <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
+                      <view>{{pulscardname}}</view>
+                    </view>
+                  </block>
                 </view>
-              </block>
-            </view>
  
-            <view class="xc-uesr-name">
-              <view class="flex ai-center">
-                <text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text>
-                <view class="hvip" wx:if='{{GradeName && is_init}}'>
-                  <image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{GradeName}}
+                <view class="xc-uesr-name">
+                  <view class="flex ai-center">
+                    <text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text>
+                    <view class="hvip" wx:if='{{GradeName && is_init}}'>
+                      <image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{GradeName}}
+                    </view>
+                  </view>
+
+
+
+
+                  <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
+                    <block wx:if="{{cz_val<full_cz_val}}">
+                      {{" "}}
+                      <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text>
+                      <view style='margin-left:5rpx; '>{{cz_val}} / {{need_money}}</view>
+                    </block>
+                    <block wx:else>
+                      {{" "}}
+                      <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text> {{cz_val}}
+                    </block>
+                  </view>
                 </view>
+
               </view>
  
+              <view class="xc-user-left  flex" wx:else bindtap="gobindtel">
+                <image class="xc-user-img  circle" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
+                <view class="xc-uesr-name">请点击注册</view>
+              </view>
  
  
+            </view>
+            <view wx:if="{{userInfo}}" class="xc-qrcode-frame abs ">
+              <!-- {{iurl}}/miniapp -->
+              <image bindtap='show_tc' class=" xc-qrcode " style="border: 5rpx solid {{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};background: {{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};" src="{{iurl}}/miniapp/images/qrcode1.png"></image>
+              <view style="font-size:12px;color: #fff;">会员卡</view>
+            </view>
+            <view class="flex-vertical abs xc-grow-frame rel" style="display: none">
+              <view class="xc-grow-up">{{rfmName}}</view>
  
-              <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
-                <block wx:if="{{cz_val<full_cz_val}}">
-                  {{" "}}
-                  <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text>
-                  <view style='margin-left:5rpx; '>{{cz_val}} / {{need_money}}</view>
-                </block>
-                <block wx:else>
-                  {{" "}}
-                  <text class="grow-up-val"  style="background:{{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};">{{rfmName}}</text> {{cz_val}}
-                </block>
+              <view class="xc-line-not rel">
+                <image class="xc-bj-img abs" src="{{iurl}}/miniapp/images/baijing.png"></image>
+                <image class="xc-zs-img abs" src="{{iurl}}/miniapp/images/zhuangshi.png"></image>
+                <view class="xc-line-Yes abs" style="width:{{length}}rpx;"></view>
               </view>
-            </view>
  
-          </view>
+              <view class="xc-grow-val">0/0</view>
+            </view>
+            <view class="flex-equality  abs xc-assets">
+              <view class="t-c typefont" bindtap='balance'>{{yuer?yuer:0}}
+                <view class='numfont'>余额</view>
+              </view>
+              <!-- 是否关闭 -->
+              <block wx:if="{{!is_close_chuzhi}}">
+                <view class="t-c typefont" bindtap='deposit'>{{udata.Balance?udata.Balance:0}}
+                  <view class='numfont'>储值款</view>
+                </view>
+              </block>
  
-          <view class="xc-user-left  flex" wx:else bindtap="gobindtel">
-            <image class="xc-user-img  circle" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
-            <view class="xc-uesr-name">请点击注册</view>
-          </view>
+              <view class="t-c typefont" bindtap='integral'>{{udata.Integral?udata.Integral:0}}
+                <view class='numfont'>积分</view>
+              </view>
  
+              <view class="t-c typefont" bindtap='coupon'>{{udata.CashCount+byquan?udata.CashCount+byquan:0}}
+                <view class='numfont'>优惠券</view>
+              </view>
+            </view>
+          </image>
  
         </view>
-        <view wx:if="{{userInfo}}" class="xc-qrcode-frame abs ">
-          <!-- {{iurl}}/miniapp -->
-          <image bindtap='show_tc' class=" xc-qrcode " style="border: 5rpx solid {{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};background: {{usertop_ad.bgcolor?usertop_ad.bgcolor:'#fe9db5'}};" src="{{iurl}}/miniapp/images/qrcode1.png"></image>
-          <view style="font-size:12px;color: #fff;">会员卡</view>
-        </view>
-        <view class="flex-vertical abs xc-grow-frame rel" style="display: none">
-          <view class="xc-grow-up">{{rfmName}}</view>
+        <block wx:if="{{is_no_plus}}">
+          <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==2 && show_buy_plus }}">
+            <view class="xc-add-member flex-center-around ">
+              <view class="flex jc-center ai-center">
+                <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
+                <view class="member fs28 "> 加入plus会员预计可省3031元</view>
+              </view>
+              <view class="xc-opening-button t-c" data-url="/pages/user/plus/plus" bindtap="goto">
+                <view class="xc-opening fs28">立即开通</view>
+              </view>
+            </view>
+          </view>
  
-          <view class="xc-line-not rel">
-            <image class="xc-bj-img abs" src="{{iurl}}/miniapp/images/baijing.png"></image>
-            <image class="xc-zs-img abs" src="{{iurl}}/miniapp/images/zhuangshi.png"></image>
-            <view class="xc-line-Yes abs" style="width:{{length}}rpx;"></view>
+          <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==3 && show_buy_plus}}">
+            <view class="xc-add-member flex-center-around ">
+              <view class="flex jc-center ai-center">
+                <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
+                <view class="member fs28 "> 加入plus会员预计可省3031元</view>
+              </view>
+              <view class="xc-opening-button t-c" data-url="/packageE/pages/user/cardinfo/cardinfo" bindtap="goto">
+                <view class="xc-opening fs28">立即续费</view>
+              </view>
+            </view>
           </view>
+        </block>
  
-          <view class="xc-grow-val">0/0</view>
-        </view>
-        <view class="flex-equality  abs xc-assets">
-          <view class="t-c typefont" bindtap='balance'>{{yuer?yuer:0}}
-            <view class='numfont'>余额</view>
+      </view>
+      <view class="xc-after-sale rel">
+        <!-- 顶上的一栏 -->
+        <view class="xc-equity-title flex-level">
+          <view class="xc-title-frame flex ai-center">
+            <view class="flex-vertical xc-title-content" bindtap="go_order" data-url="/pages/user/order_list/order_list">
+              <image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image>
+              <view class="three-level-word">我的订单</view>
+            </view>
+            <!-- 物流信息提醒 -->
+            <view class="fs26 c-5 pdl60" wx:if="{{countDadaOrder && countDadaOrder != 0}}" bindtap="go_order" data-url="/pages/user/order_list/order_list?index=1"><text class="iconfont icon-dingwei"></text>您有<text class="c-red">{{countDadaOrder}}</text>个同城配送订单</view>
           </view>
-          <!-- 是否关闭 -->
-          <block wx:if="{{!is_close_chuzhi}}">
-          <view class="t-c typefont" bindtap='deposit'>{{udata.Balance?udata.Balance:0}}
-            <view class='numfont'>储值款</view>
+          <view class="three-level-word  xc-more-frame flex-vertical" bindtap="go_order" data-url="/pages/user/order_list/order_list">
+            <view class="three-level-word xc-more">更多</view>
+            <view class="bg_right xc-more-click bcolor"></view>
+          </view>
+        </view>
+        <!-- 内容的一栏 -->
+        <view class="xc-after-sale-left flex-center-around">
+          <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=1">
+            <image class="xc-no-money" src="{{iurl}}/miniapp/images/daifuk.png"></image>
+            <view class=" xc-word-color four-level-word">待付款</view>
+            <text class="order-num" hidden='{{toji.wait_pay>0?"":"true"}}'>{{toji.wait_pay}}</text>
           </view>
-          </block>
  
-          <view class="t-c typefont" bindtap='integral'>{{udata.Integral?udata.Integral:0}}
-            <view class='numfont'>积分</view>
+          <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=2">
+            <image class="xc-send" src="{{iurl}}/miniapp/images/dfahuo.png?v=1"></image>
+            <view class="xc-word-color four-level-word">待发货</view>
+            <text class="order-num" hidden='{{toji.wait_send>0?"":"true"}}'>{{toji.wait_send}}</text>
           </view>
  
-          <view class="t-c typefont" bindtap='coupon'>{{udata.CashCount+byquan?udata.CashCount+byquan:0}}
-            <view class='numfont'>优惠券</view>
+          <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=3">
+            <image class="xc-await" src="{{iurl}}/miniapp/images/shouhuo1.png"></image>
+            <view class="xc-word-color four-level-word">待收货</view>
+            <text class="order-num" hidden='{{toji.wait_receive>0?"":"true"}}'>{{toji.wait_receive}}</text>
+          </view>
+          <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=4">
+            <image class="xc-no-money" src="{{iurl}}/miniapp/images/dpr1.png"></image>
+            <view class="xc-word-color four-level-word">待评论</view>
+            <text class="order-num" hidden='{{toji.wait_pj>0?"":"true"}}'>{{toji.wait_pj}}</text>
+          </view>
+          <view class="t-c margin-auto rel" style='margin-left:30rpx;' bindtap="go_order" data-url="/packageF/pages/user/return_goods_list/return_goods_list">
+            <image class="xc-no-money" src="{{iurl}}/miniapp/images/shouh1.png"></image>
+            <view style='height:36rpx;'> </view>
+            <view class="xc-word-color four-level-word abs">售后/退款</view>
+            <!--<text class="order-num" hidden='{{toji.wait_return>0>0?"":"true"}}' style="right: -20rpx">{{toji.wait_return}}</text>-->
           </view>
-        </view>
-      </image>
  
-    </view>
-   <block wx:if="{{is_no_plus}}">
-    <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==2 && show_buy_plus }}">
-      <view class="xc-add-member flex-center-around ">
-        <view class="flex jc-center ai-center">
-          <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
-          <view class="member fs28 "> 加入plus会员预计可省3031元</view>
-        </view>
-        <view class="xc-opening-button t-c" data-url="/pages/user/plus/plus" bindtap="goto">
-          <view class="xc-opening fs28">立即开通</view>
         </view>
-      </view>
-    </view>
+        <view style="clear: both"></view>
  
-    <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==3 && show_buy_plus}}">
-      <view class="xc-add-member flex-center-around ">
-        <view class="flex jc-center ai-center">
-          <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
-          <view class="member fs28 "> 加入plus会员预计可省3031元</view>
-        </view>
-        <view class="xc-opening-button t-c" data-url="/packageE/pages/user/cardinfo/cardinfo" bindtap="goto">
-          <view class="xc-opening fs28">立即续费</view>
-        </view>
       </view>
-    </view>
-   </block>
-
-  </view>
-  <view class="xc-after-sale rel">
-    <!-- 顶上的一栏 -->
-    <view class="xc-equity-title flex-level">
-      <view class="xc-title-frame flex ai-center">
-        <view class="flex-vertical xc-title-content" bindtap="go_order" data-url="/pages/user/order_list/order_list">
-          <image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image>
-          <view class="three-level-word">我的订单</view>
+
+      <!-- 我的权益 -->
+      <view class="xc-my-equity-frame" wx:if="{{is_init }}">
+        <view class="xc-equity-title flex-level" bindtap="go_qy">
+          <view class="xc-title-frame flex-space-between">
+            <view class="flex-vertical xc-title-content">
+              <image class="xc-title-img" src="{{iurl}}/miniapp/images/medal.png"></image>
+              <view class="three-level-word">我的权益</view>
+            </view>
+          </view>
+          <view wx:if="{{is_grad_get}}" class="three-level-word  xc-more-frame flex-vertical">
+            <view class="three-level-word xc-more">更多</view>
+            <view class="bg_right xc-more-click bcolor"></view>
+          </view>
+          <view wx:else class="three-level-word  xc-more-frame flex-vertical" style="justify-content: flex-end">
+            <image style="width: 40rpx; height: 40rpx; margin-right: 20rpx" src="{{iurl}}/miniapp/images/loader.gif"></image>
+          </view>
         </view>
-        <!-- 物流信息提醒 -->
-        <view class="fs26 c-5 pdl60" wx:if="{{countDadaOrder && countDadaOrder != 0}}" bindtap="go_order" data-url="/pages/user/order_list/order_list?index=1"><text class="iconfont icon-dingwei"></text>您有<text class="c-red">{{countDadaOrder}}</text>个同城配送订单</view>
-      </view>
-      <view class="three-level-word  xc-more-frame flex-vertical" bindtap="go_order" data-url="/pages/user/order_list/order_list">
-        <view class="three-level-word xc-more">更多</view>
-        <view class="bg_right xc-more-click bcolor"></view>
-      </view>
-    </view>
-    <!-- 内容的一栏 -->
-    <view class="xc-after-sale-left flex-center-around">
-      <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=1">
-        <image class="xc-no-money" src="{{iurl}}/miniapp/images/daifuk.png"></image>
-        <view class=" xc-word-color four-level-word">待付款</view>
-        <text class="order-num" hidden='{{toji.wait_pay>0?"":"true"}}'>{{toji.wait_pay}}</text>
-      </view>
  
-      <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=2">
-        <image class="xc-send" src="{{iurl}}/miniapp/images/dfahuo.png?v=1"></image>
-        <view class="xc-word-color four-level-word">待发货</view>
-        <text class="order-num" hidden='{{toji.wait_send>0?"":"true"}}'>{{toji.wait_send}}</text>
-      </view>
+        <block wx:if="{{is_grad_get}}">
+          <block wx:if="{{qy_list && gradeId}}">
+            <view class="xc-specific-more-frame flex-vertical" wx:if="{{qy_list}}">
  
-      <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=3">
-        <image class="xc-await" src="{{iurl}}/miniapp/images/shouhuo1.png"></image>
-        <view class="xc-word-color four-level-word">待收货</view>
-        <text class="order-num" hidden='{{toji.wait_receive>0?"":"true"}}'>{{toji.wait_receive}}</text>
-      </view>
-      <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=4">
-        <image class="xc-no-money" src="{{iurl}}/miniapp/images/dpr1.png"></image>
-        <view class="xc-word-color four-level-word">待评论</view>
-        <text class="order-num" hidden='{{toji.wait_pj>0?"":"true"}}'>{{toji.wait_pj}}</text>
-      </view>
-      <view class="t-c margin-auto rel" style='margin-left:30rpx;' bindtap="go_order" data-url="/packageF/pages/user/return_goods_list/return_goods_list">
-        <image class="xc-no-money" src="{{iurl}}/miniapp/images/shouh1.png"></image>
-        <view style='height:36rpx;'> </view>
-        <view class="xc-word-color four-level-word abs">售后/退款</view>
-        <!--<text class="order-num" hidden='{{toji.wait_return>0>0?"":"true"}}' style="right: -20rpx">{{toji.wait_return}}</text>-->
-      </view>
+              <view bindtap="click_pre">
+                <view class="bg_left xc-left bcolor"></view>
+              </view>
  
-    </view>
-    <view style="clear: both"></view>
+              <swiper current="{{sw_index}}" style='width:82.7%; height:108rpx' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
  
-  </view>
+                <swiper-item wx:for="{{qy_list}}" wx:for-item="aitem" wx:for-index="pidx">
+                  <view class="flex xc-middle">
  
-  <!-- 我的权益 -->
-  <view class="xc-my-equity-frame" wx:if="{{is_init }}">
-    <view class="xc-equity-title flex-level" bindtap="go_qy">
-      <view class="xc-title-frame flex-space-between">
-        <view class="flex-vertical xc-title-content">
-          <image class="xc-title-img" src="{{iurl}}/miniapp/images/medal.png"></image>
-          <view class="three-level-word">我的权益</view>
-        </view>
-      </view>
-      <view wx:if="{{is_grad_get}}" class="three-level-word  xc-more-frame flex-vertical">
-        <view class="three-level-word xc-more">更多</view>
-        <view class="bg_right xc-more-click bcolor"></view>
-      </view>
-      <view wx:else class="three-level-word  xc-more-frame flex-vertical" style="justify-content: flex-end">
-        <image style="width: 40rpx; height: 40rpx; margin-right: 20rpx" src="{{iurl}}/miniapp/images/loader.gif"></image>
-      </view>
-    </view>
+                    <view class="xc-center-frame t-c" wx:for="{{aitem}}" data-img="{{item.PrivilegeImageUrl}}" data-no="{{item.PrivilegeType}}" data-ind="{{index}}" data-find="{{pidx}}" bindtap="go_qy_url">
+                      <!-- <text>qy_list.privilegeICOUrl</text> -->
+                      <image class="xc-center-img  {{item.ishas==1?'':'img_gray'}}" src="{{item.PrivilegeICOUrl}}"></image>
+                      <view class="four-level-word">{{item.PrivilegeName}}</view>
+                    </view>
+                  </view>
+                </swiper-item>
  
-    <block wx:if="{{is_grad_get}}">
-      <block wx:if="{{qy_list && gradeId}}">
-        <view class="xc-specific-more-frame flex-vertical" wx:if="{{qy_list}}">
+              </swiper>
  
-          <view bindtap="click_pre">
-            <view class="bg_left xc-left bcolor"></view>
+              <view bindtap="click_next">
+                <view class="bg_right xc-right bcolor mt"></view>
+              </view>
+            </view>
+          </block>
+          <view wx:else style="text-align: center">
+            未找到数据
           </view>
+        </block>
  
-          <swiper current="{{sw_index}}" style='width:82.7%; height:108rpx' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
  
-            <swiper-item wx:for="{{qy_list}}" wx:for-item="aitem" wx:for-index="pidx">
-              <view class="flex xc-middle">
  
-                <view class="xc-center-frame t-c" wx:for="{{aitem}}" data-img="{{item.PrivilegeImageUrl}}" data-no="{{item.PrivilegeType}}" data-ind="{{index}}" data-find="{{pidx}}" bindtap="go_qy_url">
-                  <!-- <text>qy_list.privilegeICOUrl</text> -->
-                  <image class="xc-center-img  {{item.ishas==1?'':'img_gray'}}" src="{{item.PrivilegeICOUrl}}"></image>
-                  <view class="four-level-word">{{item.PrivilegeName}}</view>
-                </view>
-              </view>
-            </swiper-item>
  
-          </swiper>
-
-          <view bindtap="click_next">
-            <view class="bg_right xc-right bcolor mt"></view>
-          </view>
+      </view>
+      <!-- 生日营销 is_banner-->
+      <block wx:if="{{is_banner}}">
+        <view class="t-c banner-frame" bindtap="clike_banne">
+          <image class="banner-img" src="{{actImg==''?iurl+'/miniapp/images/user/banner-img.jpg':iurl+actImg}}">
+          </image>
         </view>
       </block>
-      <view wx:else style="text-align: center">
-        未找到数据
-      </view>
-    </block>
-
-
-
-
-  </view>
-  <!-- 生日营销 is_banner-->
-  <block wx:if="{{is_banner}}">
-    <view class="t-c banner-frame" bindtap="clike_banne">
-      <image class="banner-img" src="{{actImg==''?iurl+'/miniapp/images/user/banner-img.jpg':iurl+actImg}}">
-      </image>
-    </view>
-  </block>
-
-  <!-- 工具与服务 -->
-  <view class="xc-tool-service">
-    <view class="xc-tool-service-title flex-vertical">
-      <image class="xc-tool-service-img" src="{{iurl}}/miniapp/images/gj.png"></image>
-      <view class="three-level-word xc-tool-service-word">工具与服务</view>
-    </view>
-    <view class="xc-project-frame">
-      <!-- 跳转页面 -->
-      <view class="center_v" style="display: flex;flex-wrap: wrap;align-items: center;">
-        <!-- 循环使用自定义菜单，显示和掩藏 -->
-        <block wx:for="{{user_tool}}">
-          <!-- 判断系统配置中有没有把菜单关闭 -->
-          <block wx:if="{{!util.is_close(item.name,c_list)}}">
-            <!-- 有链接地址的时候 -->
-            <block wx:if="{{item.new_weappurl}}">
-              <block wx:if="{{item.name=='PLUS会员'}}">
-                <view class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto" wx:if="{{is_dengji==1}}">
-                  <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
-                  <view class="fs26">PLUS会员</view>
-                </view>
-              </block>
-              <block wx:elif="{{item.name=='助力活动'}}">
-                <view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav" wx:if="{{is_assistance==1}}">
-                  <image class="xc-center-img" src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image>
-                  <view class="four-level-word">助力活动</view>
-                </view>
-              </block>
-              <block wx:elif="{{item.name=='我的权益'}}">
-                <view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}">
-                  <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
-                  <view class="fs26">我的权益</view>
-                </view>
-              </block>
-              <block wx:elif="{{item.name=='套盒商品'}}">
-                <view class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto" wx:if="{{enableMeiye}}">
-                  <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
-                  <view class="fs26">套盒商品</view>
-                </view>
-              </block>
  
-              <block wx:elif="{{item.name=='瘦身日记'}}">
-                <view wx:if="{{has_rj>0}}" class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto_nav">
-                  <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
-                  <view class="fs26">{{item.name}}</view>
-                </view>
-              </block>
-              
-              <block wx:else>
-                <view class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto_nav">
-                  <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
-                  <view class="fs26">{{item.name}}</view>
-                </view>
+      <!-- 工具与服务 -->
+      <view class="xc-tool-service">
+        <view class="xc-tool-service-title flex-vertical">
+          <image class="xc-tool-service-img" src="{{iurl}}/miniapp/images/gj.png"></image>
+          <view class="three-level-word xc-tool-service-word">工具与服务</view>
+        </view>
+        <view class="xc-project-frame">
+          <!-- 跳转页面 -->
+          <view class="center_v" style="display: flex;flex-wrap: wrap;align-items: center;">
+            <!-- 循环使用自定义菜单，显示和掩藏 -->
+            <block wx:for="{{user_tool}}">
+              <!-- 判断系统配置中有没有把菜单关闭 -->
+              <block wx:if="{{!util.is_close(item.name,c_list)}}">
+                <!-- 有链接地址的时候 -->
+                <block wx:if="{{item.new_weappurl}}">
+                  <block wx:if="{{item.name=='PLUS会员'}}">
+                    <view class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto" wx:if="{{is_dengji==1}}">
+                      <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+                      <view class="fs26">PLUS会员</view>
+                    </view>
+                  </block>
+                  <block wx:elif="{{item.name=='助力活动'}}">
+                    <view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav" wx:if="{{is_assistance==1}}">
+                      <image class="xc-center-img" src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image>
+                      <view class="four-level-word">助力活动</view>
+                    </view>
+                  </block>
+                  <block wx:elif="{{item.name=='我的权益'}}">
+                    <view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}">
+                      <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
+                      <view class="fs26">我的权益</view>
+                    </view>
+                  </block>
+                  <block wx:elif="{{item.name=='套盒商品'}}">
+                    <view class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto" wx:if="{{enableMeiye}}">
+                      <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
+                      <view class="fs26">套盒商品</view>
+                    </view>
+                  </block>
+
+                  <block wx:elif="{{item.name=='瘦身日记'}}">
+                    <view wx:if="{{has_rj>0}}" class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto_nav">
+                      <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
+                      <view class="fs26">{{item.name}}</view>
+                    </view>
+                  </block>
+
+                  <block wx:else>
+                    <view class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto_nav">
+                      <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
+                      <view class="fs26">{{item.name}}</view>
+                    </view>
+                  </block>
+                </block>
+                <!-- 没有链接地址的时候 -->
+                <block wx:else>
+                  <block wx:if="{{item.name=='联系客服'}}">
+                    <!-- <button class="item t-c" wx:if="{{sys_switch.weapp_customertype==1}}" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+                      <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+                      <view class="fs26">联系客服</view>
+                    </button>
+
+                    <view class="item t-c" bindtap="con_weixin" wx:elif="{{sys_switch.weapp_customertype==2}}">
+                      <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+                      <view class="fs26">联系客服</view>
+                    </view>
+
+                    <view class="item t-c" bindtap="contactService" wx:else>
+                      <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+                      <view class="fs26">联系客服</view>
+                    </view> -->
+
+                    <view class="item t-c" bindtap="openCS">
+                      <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+                      <view class="fs26">联系客服</view>
+                    </view>
+
+                  </block>
+                  <block wx:elif="{{item.name=='收入卡包'}}">
+                    <view class="item t-c" bindtap="addcard" wx:if="{{add_card_data}}">
+                      <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+                      <view class="four-level-word">收入卡包</view>
+                    </view>
+                  </block>
+                </block>
               </block>
             </block>
-            <!-- 没有链接地址的时候 -->
-            <block wx:else>
-              <block wx:if="{{item.name=='联系客服'}}">
-                <!-- <button class="item t-c" wx:if="{{sys_switch.weapp_customertype==1}}" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
-                  <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
-                  <view class="fs26">联系客服</view>
-                </button>
-
-                <view class="item t-c" bindtap="con_weixin" wx:elif="{{sys_switch.weapp_customertype==2}}">
-                  <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
-                  <view class="fs26">联系客服</view>
-                </view>
-
-                <view class="item t-c" bindtap="contactService" wx:else>
-                  <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
-                  <view class="fs26">联系客服</view>
-                </view> -->
-								
-								<view class="item t-c" bindtap="openCS">
-								  <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
-								  <view class="fs26">联系客服</view>
-								</view>
+          </view>
  
-              </block>
-              <block wx:elif="{{item.name=='收入卡包'}}">
-                <view class="item t-c" bindtap="addcard" wx:if="{{add_card_data}}">
-                  <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
-                  <view class="four-level-word">收入卡包</view>
-                </view>
-              </block>
-            </block>
-          </block>
-        </block>
+        </view>
       </view>
  
-    </view>
-  </view>
-
-  <!-- 显示推荐 -->
-  <view style='width:100%;height:73rpx;' wx:if="{{is_show_recommend}}">
-    <view class="xc-recommend-goods flex-center">
+      <!-- 显示推荐 -->
+      <view style='width:100%;height:73rpx;' wx:if="{{is_show_recommend}}">
+        <view class="xc-recommend-goods flex-center">
  
-      <view class="circle xc-small">
-      </view>
-      <view class="circle xc-zhong">
-      </view>
-      <view class="circle xc-big">
-      </view>
-      <view class="three-level-word xc-recommend">为你推荐</view>
-      <view class="circle xc-big">
-      </view>
-      <view class="circle xc-zhong">
+          <view class="circle xc-small">
+          </view>
+          <view class="circle xc-zhong">
+          </view>
+          <view class="circle xc-big">
+          </view>
+          <view class="three-level-word xc-recommend">为你推荐</view>
+          <view class="circle xc-big">
+          </view>
+          <view class="circle xc-zhong">
+          </view>
+          <view class="circle xc-small" style='margin-left:15rpx;'>
+            <!-- </view> -->
+          </view>
+        </view>
       </view>
-      <view class="circle xc-small" style='margin-left:15rpx;'>
-        <!-- </view> -->
+      <!-- 显示商品 -->
+      <!-- 好物推荐 -->
+      <block wx:if="{{is_show_recommend}}">
+        <goods_recommend id="goods_recommend"></goods_recommend>
+      </block>
+
+      <!-- 技术支持 -->
+      <view class="logo-container t-c">
+        <view class="flex ai_c fs24 jc-center pdv30 white">
+          <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持
+        </view>
       </view>
-    </view>
-  </view>
  
-  <!-- 显示商品 -->
-  <!-- 好物推荐 -->
-  <block wx:if="{{is_show_recommend}}">
-  <goods_recommend id="goods_recommend"></goods_recommend>
-  </block>
  
-  <!-- 技术支持 -->
-  <view class="logo-container t-c">
-    <view class="flex ai_c fs24 jc-center pdv30 white">
-      <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持
     </view>
-  </view>
-</view>
-
-<!--弹出层内容，其中的“我知道”中绑定让弹出层消失的函数：bindtap="hide"-->
-<view class="tc_view" hidden='{{tc_hide}}' bindtap='hide_tc'>
-  <view class="modal-box" hidden="{{flag}}" bindtap="hide" catchtouchmove="true"></view>
-  <view class="modal-body" catchtouchmove="true">
-    <view class="modal-content">
-      <view class="flex">
-        <image src="{{userInfo.head_pic}}" class="hd_img"></image>
-        <view class="ctent_txt">
-          <view class='txt1'>{{userInfo.nickname}}
-            <image wx:if="{{userInfo.sex==2}}" class="arrow-right" style="width: 35rpx; height:35rpx; top: 5rpx" src="{{iurl}}/miniapp/images/user/wum.png"></image>
-            <image wx:else class="arrow-right fu" style="width: 35rpx; height:35rpx;top:5rpx" src="{{iurl}}/miniapp/images/user/man.png"></image>
+
+    <!--弹出层内容，其中的“我知道”中绑定让弹出层消失的函数：bindtap="hide"-->
+    <view class="tc_view" hidden='{{tc_hide}}' bindtap='hide_tc'>
+      <view class="modal-box" hidden="{{flag}}" bindtap="hide" catchtouchmove="true"></view>
+      <view class="modal-body" catchtouchmove="true">
+        <view class="modal-content">
+          <view class="flex">
+            <image src="{{userInfo.head_pic}}" class="hd_img"></image>
+            <view class="ctent_txt">
+              <view class='txt1'>{{userInfo.nickname}}
+                <image wx:if="{{userInfo.sex==2}}" class="arrow-right" style="width: 35rpx; height:35rpx; top: 5rpx" src="{{iurl}}/miniapp/images/user/wum.png"></image>
+                <image wx:else class="arrow-right fu" style="width: 35rpx; height:35rpx;top:5rpx" src="{{iurl}}/miniapp/images/user/man.png"></image>
+              </view>
+              <view wx:if="{{userInfo.address}}" class='txt2'>{{userInfo.address}}</view>
+            </view>
+          </view>
+          <view class="m_ta">
+            <!--<image class='g_img' src='https://mshop.yolipai.net//index.php?m=Home&c=Index&a=qr_code&data={{userInfo.mobile}}'></image>-->
+            <canvas class="g_img" canvas-id="qrcode" />
           </view>
-          <view wx:if="{{userInfo.address}}" class='txt2'>{{userInfo.address}}</view>
+          <view class="s_sao">前台收银扫此二维码，即可享受优惠！</view>
         </view>
       </view>
-      <view class="m_ta">
-        <!--<image class='g_img' src='https://mshop.yolipai.net//index.php?m=Home&c=Index&a=qr_code&data={{userInfo.mobile}}'></image>-->
-        <canvas class="g_img" canvas-id="qrcode" />
-      </view>
-      <view class="s_sao">前台收银扫此二维码，即可享受优惠！</view>
     </view>
-  </view>
-</view>
  
-<pop_txt id="pop_txt"></pop_txt>
+    <pop_txt id="pop_txt"></pop_txt>
+    <include src="../../../components/com_servicer/com_servicer.wxml"/>
  
+  </block>
  
-<include src="../../../components/com_servicer/com_servicer.wxml"/>
+</block>