From ba7c976d940ac7eaa3258321201fe8fbd2241758 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 18 Dec 2023 16:08:48 +0800
Subject: [PATCH] 组件的优化

---
 components/com_top_nav/com_top_nav.js                           |  2 +-
 components/diy_user_info/diy_user_info.js                       | 33 +++++++++++++++++++++------------
 components/diy_user_my_rights/diy_user_my_rights.wxss           |  1 +
 components/diy_user_order/diy_user_order.js                     |  6 +++++-
 components/diy_user_order/diy_user_order.wxml                   | 10 +++++-----
 components/diy_user_order/diy_user_order.wxss                   |  2 --
 components/diy_user_tools_services/diy_user_tools_services.js   |  9 ++++++++-
 components/diy_user_tools_services/diy_user_tools_services.wxml |  2 +-
 packageG/pages/user_template/index.js                           | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
 packageG/pages/user_template/index.json                         |  8 ++++++--
 packageG/pages/user_template/index.wxml                         | 34 ++++++++++++++++++++++++++++++----
 packageG/pages/user_template/index.wxss                         | 30 +++++++++++++++++++++++++++++-
 12 files changed, 171 insertions(+), 42 deletions(-)

diff --git a/components/com_top_nav/com_top_nav.js b/components/com_top_nav/com_top_nav.js
index a111153..10f442e 100644
--- a/components/com_top_nav/com_top_nav.js
+++ b/components/com_top_nav/com_top_nav.js
@@ -23,7 +23,7 @@ Component({
   },
   ready: function() {
       let height= getApp().globalData.navBarHeight;
-      let menuInfo = getApp().globalData.menuInfo;
+      let menuInfo = getApp().globalData.menuInfo || {height:0};
       let user_no='';
       if(getApp().globalData.userInfo){
           user_no=getApp().globalData.userInfo.erpvipno
diff --git a/components/diy_user_info/diy_user_info.js b/components/diy_user_info/diy_user_info.js
index b2f952e..0695126 100644
--- a/components/diy_user_info/diy_user_info.js
+++ b/components/diy_user_info/diy_user_info.js
@@ -6,22 +6,34 @@ var r=s;
 Component({
   properties: {
     object: {
-      type: Object,
-      value: null
+       type: Object,
+       value: null
     },
     qy_data:{
-      type: Object,
-      value: null
+       type: Object,
+       value: null
     },
     pulscardname:{
-          type:String,
-          value:"--"
+        type:String,
+        value:"--"
     },
     rfmName:{
-          type:String,
-          value:"--"
+        type:String,
+        value:"--"
     },
-    // 这里定义了innerText属性，属性值可以在组件使用时指定
+    yuer:{
+        type:Number,
+        value:0
+    },
+    byquan:{
+          type:Number,
+          value:0
+    },
+    udata:{
+        type: Object,
+        value: null
+    },
+
   },
   data: {
     // 这里是一些组件内部数据
@@ -35,11 +47,9 @@ Component({
 
   ready: function() {
        var th=this;
-
        if(getApp().globalData.userInfo){
             this.setData({userInfo:getApp().globalData.userInfo});
        }
-
        /*-------系统是否开通等级卡，会员是等级卡-----*/
        getApp().getConfig2(function (e) {
            var t_swi = e.switch_list;
@@ -60,7 +70,6 @@ Component({
     }
   },
 
-
   methods: {
       //登陆会员
       login_user(){
diff --git a/components/diy_user_my_rights/diy_user_my_rights.wxss b/components/diy_user_my_rights/diy_user_my_rights.wxss
index cab2c62..74624b4 100644
--- a/components/diy_user_my_rights/diy_user_my_rights.wxss
+++ b/components/diy_user_my_rights/diy_user_my_rights.wxss
@@ -95,6 +95,7 @@
 .banner-frame {
   width: 100%;
   background: #f2f2f2;
+  padding-top: 20rpx;
 }
 
 button::after {
diff --git a/components/diy_user_order/diy_user_order.js b/components/diy_user_order/diy_user_order.js
index af0e33d..ab2f488 100644
--- a/components/diy_user_order/diy_user_order.js
+++ b/components/diy_user_order/diy_user_order.js
@@ -5,7 +5,11 @@ Component({
       type: Object,
       value: null
     },
-    // 这里定义了innerText属性，属性值可以在组件使用时指定
+    // 统计相关的
+    toji:{
+      type: Object,
+      value: null
+    },
 
   },
   data: {
diff --git a/components/diy_user_order/diy_user_order.wxml b/components/diy_user_order/diy_user_order.wxml
index 6e33afc..55249dd 100644
--- a/components/diy_user_order/diy_user_order.wxml
+++ b/components/diy_user_order/diy_user_order.wxml
@@ -21,14 +21,14 @@
                 <block wx:if="{{item.show}}">
                     <block wx:if="{{item.name=='待付款'}}">
                         <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=1">
-                            <image mode="heightFix" wx:if="{{object.is_icon}}" class="xc-no-money" src="{{iurl}}/miniapp/images/daifuk.png"></image>
+                            <image mode="heightFix" wx:if="{{object.is_icon}}" class="xc-no-money" src="{{item.src}}"></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>
                     <block wx:if="{{item.name=='待发货'}}">
                         <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=2">
-                            <image  mode="heightFix"  wx:if="{{object.is_icon}}" class="xc-send" src="{{iurl}}/miniapp/images/dfahuo.png?v=1"></image>
+                            <image  mode="heightFix"  wx:if="{{object.is_icon}}" class="xc-send" src="{{item.src}}"></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>
@@ -36,7 +36,7 @@
                     </block>
                     <block wx:if="{{item.name=='待收货'}}">
                         <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=3">
-                            <image  mode="heightFix"  wx:if="{{object.is_icon}}" class="xc-await" src="{{iurl}}/miniapp/images/shouhuo1.png"></image>
+                            <image  mode="heightFix"  wx:if="{{object.is_icon}}" class="xc-await" src="{{item.src}}"></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>
@@ -44,7 +44,7 @@
                     </block>
                     <block wx:if="{{item.name=='待评论'}}">
                         <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=4">
-                            <image  mode="heightFix"  wx:if="{{object.is_icon}}" class="xc-no-money" src="{{iurl}}/miniapp/images/dpr1.png"></image>
+                            <image  mode="heightFix"  wx:if="{{object.is_icon}}" class="xc-no-money" src="{{item.src}}"></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>
@@ -52,7 +52,7 @@
                     </block>
                     <block wx:if="{{item.name=='售后/退款'}}">
                         <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 mode="heightFix"  wx:if="{{object.is_icon}}" class="xc-no-money" src="{{iurl}}/miniapp/images/shouh1.png"></image>
+                            <image mode="heightFix"  wx:if="{{object.is_icon}}" class="xc-no-money" src="{{item.src}}"></image>
                             <view style='height:36rpx;'> </view>
                             <view class="xc-word-color four-level-word abs">售后/退款</view>
                         </view>
diff --git a/components/diy_user_order/diy_user_order.wxss b/components/diy_user_order/diy_user_order.wxss
index 76cb9e3..90c0118 100644
--- a/components/diy_user_order/diy_user_order.wxss
+++ b/components/diy_user_order/diy_user_order.wxss
@@ -1,7 +1,6 @@
 @import '../../app.wxss';
 .xc-after-sale {
   width: 100%;
-  border-bottom: 10px solid #f2f2f2;
 }
 .xc-after-sale-left {
   width: 96%;
@@ -10,7 +9,6 @@
   margin-bottom: 25rpx;
 }
 
-
 .xc-equity-title {
   width: 100%;
   height: 79rpx;
diff --git a/components/diy_user_tools_services/diy_user_tools_services.js b/components/diy_user_tools_services/diy_user_tools_services.js
index 1ae4cfc..9b07a2c 100644
--- a/components/diy_user_tools_services/diy_user_tools_services.js
+++ b/components/diy_user_tools_services/diy_user_tools_services.js
@@ -14,18 +14,25 @@ Component({
       type: Object,
       value: null
     },
+    qy_data: {
+      type: Object,
+      value: null
+    },
     // 这里定义了innerText属性，属性值可以在组件使用时指定
     //-- 是不是初始化了 --
     is_dengji:{
       type:Number,
       value:0
     },
-
     //-- 是不是有助力活动 --
     is_assistance:{
       type:Number,
       value:0
     },
+    enableMeiye:{
+      type:Number,
+      value:0
+    }
   },
 
   data: {
diff --git a/components/diy_user_tools_services/diy_user_tools_services.wxml b/components/diy_user_tools_services/diy_user_tools_services.wxml
index dacfff9..aa326b2 100644
--- a/components/diy_user_tools_services/diy_user_tools_services.wxml
+++ b/components/diy_user_tools_services/diy_user_tools_services.wxml
@@ -26,7 +26,7 @@
                             </view>
                         </block>
                         <block wx:elif="{{item.name=='我的权益'}}">
-                            <view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}">
+                            <view class="item t-c" bindtap="go_qy" wx:if="{{qy_data && qy_data.qy_list!=null && qy_data.is_init && qy_data.gradeId}}">
                                 <image wx:if="{{object.is_icon}}"  class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
                                 <view class="fs26">我的权益</view>
                             </view>
diff --git a/packageG/pages/user_template/index.js b/packageG/pages/user_template/index.js
index be194ce..15edd68 100644
--- a/packageG/pages/user_template/index.js
+++ b/packageG/pages/user_template/index.js
@@ -20,7 +20,13 @@ Page({
         udata: {},
 
         is_assistance: 0, //助力活动
-        b_gift:null      //
+        b_gift:null,       //生日礼包
+        toji: null,          //统计相关
+
+        userInfo:null,
+        enableMeiye:null,
+
+        is_show_recommend:false,
     },
 
     onLoad: function (e) {
@@ -41,9 +47,12 @@ Page({
             })
         }
 
-        if (!getApp().globalData.userInfo) {
-            getApp().goto('/packageE/pages/togoin/togoin');
-        }
+        //判断有没有登陆
+        setTimeout(() =>{
+            if (!getApp().globalData.userInfo) {
+                getApp().goto('/packageE/pages/togoin/togoin');
+            }
+        },1000)
 
     },
 
@@ -51,6 +60,23 @@ Page({
         getApp().check_can_share();
         var th = this;
 
+        if(!th.data.userInfo){
+            this.data.userInfo =getApp().globalData.userInfo;
+        }
+
+        /*-----统计-----*/
+        getApp().request.get("/api/weshop/order/waitlist", {
+            isShowLoading: 0,
+            data: {
+                user_id: getApp().globalData.user_id,isdel:0
+            },
+            success: function (su) {
+                th.setData({
+                    toji: su.data.data,
+                });
+            }
+        })
+
         /*-------系统是否开通等级卡，会员是等级卡-----*/
         getApp().getConfig2(function (e) {
             var t_swi = e.switch_list;
@@ -204,6 +230,7 @@ Page({
                 }
             }
         })
+
         this.puls_user();
         this.getVison();
 
@@ -219,7 +246,6 @@ Page({
                         udata: data,
                     });
                 }
-
             }
         })
 
@@ -262,6 +288,16 @@ Page({
             }
         });
 
+
+        // 判断是否开启美业
+        getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => {
+            if (res.data.code == 0) {
+                th.setData({
+                    enableMeiye: res.data.data.EnableMeiye,
+                });
+            };
+        });
+
         //判断一下是不是助力活动
         this.is_assistance();
         //获取工具
@@ -269,10 +305,22 @@ Page({
         //获取一下生日相关
         this.birthday();
 
-
         //获取自定义模板
         await this.init_load();
 
+        //自定义组件一定要等到页面加载完了，才来调用selectComponnent
+        setTimeout(function () {
+
+            th.setData({ is_show_recommend:true })
+            if (getApp().globalData.user_id) getApp().requestCardNum(th);
+            var goods_list = th.selectComponent("#goods_recommend"); //组件的id
+
+            if(goods_list){
+                goods_list.init();
+                goods_list.get_list();
+            }
+
+        }, 1000)
 
     },
 
@@ -314,30 +362,34 @@ Page({
                     title: temp_data.page_title,
                 });
                 var t_arr = JSON.parse(temp_data.json_str);
-                th.setData({
+
+                let obj={
                     share_title: temp_data.page_title,
                     template_arr: t_arr,
                     isTemplate: 1,
                     bgcolor_t: temp_data.bkcolor
-                });
+                };
+
                 setTimeout(() => {
                     th.newGoodsGroup()
                 }, 1000)
 
                 //---如果有设定顶部的颜色的时候--
                 if (temp_data.top_color && temp_data.top_color != 'null') {
-
                     var top_w_color = "#ffffff";
-                    if (temp_data.top_word_color && temp_data.top_word_color == 'black') {
-                        top_w_color = "#000000";
+                    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);
+
             }
         })
     },
diff --git a/packageG/pages/user_template/index.json b/packageG/pages/user_template/index.json
index d2ea6ef..702f7af 100644
--- a/packageG/pages/user_template/index.json
+++ b/packageG/pages/user_template/index.json
@@ -8,8 +8,12 @@
         "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"
+        "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"
     },
   "enablePullDownRefresh": false,
-  "onReachBottomDistance":300
+  "onReachBottomDistance":300,
+  "navigationStyle": "custom",
+  "navigationBarTitleText": "会员中心"
 }
\ No newline at end of file
diff --git a/packageG/pages/user_template/index.wxml b/packageG/pages/user_template/index.wxml
index 726e3b9..dc62b9f 100644
--- a/packageG/pages/user_template/index.wxml
+++ b/packageG/pages/user_template/index.wxml
@@ -1,3 +1,4 @@
+<com_top_nav title="会员中心"  bcolor="{{topbgColor}}" color="{{topwColor}}"></com_top_nav>
 <view class="container" style="background-color:{{bgcolor_t}}">
   <block wx:for="{{template_arr}}" wx:key="{{index}}">
     <view>
@@ -17,7 +18,7 @@
         </block>
         <!-- 我的订单 -->
         <block wx:if="{{item.ename=='order'}}">
-          <diy_user_order object="{{item.content}}"></diy_user_order>
+          <diy_user_order object="{{item.content}}" toji="{{toji}}" ></diy_user_order>
         </block>
         <!-- 我的权益 -->
         <block wx:if="{{item.ename=='my_rights'}}">
@@ -25,8 +26,8 @@
         </block>
         <!-- 工具与服务 -->
         <block wx:if="{{item.ename=='tools_services'}}">
-          <diy_user_tools_services object="{{item.content}}"  is_dengji="{{is_dengji}}"
-                                   f_user_tool="{{user_tool}}"  c_list="{{c_list}}"></diy_user_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>
@@ -49,4 +50,29 @@
       </view>
     </view>
   </view>
-</block>
\ No newline at end of file
+</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>
diff --git a/packageG/pages/user_template/index.wxss b/packageG/pages/user_template/index.wxss
index 96bcff4..4c24611 100644
--- a/packageG/pages/user_template/index.wxss
+++ b/packageG/pages/user_template/index.wxss
@@ -909,4 +909,32 @@
   height: 250rpx;
   padding-bottom:30rpx;
 }
-.container{ overflow: hidden;}
\ No newline at end of file
+.container{ overflow: hidden;}
+
+.xc-recommend-goods {
+  width: 100%;
+  height: 73rpx;
+  margin: auto;
+}
+
+.xc-small {
+  width: 10rpx;
+  height: 10rpx;
+  background: #ff5f80;
+  margin-top: 6rpx;
+}
+
+.xc-zhong {
+  width: 15rpx;
+  height: 15rpx;
+  background: #ff5f80;
+  margin-left: 12rpx;
+  margin-top: 2rpx;
+}
+
+.xc-big {
+  width: 17rpx;
+  height: 17rpx;
+  background: #ff5f80;
+  margin-left: 15rpx;
+}
\ No newline at end of file
--
libgit2 0.21.4