d

app.json

@@ -149,7 +149,7 @@
         "pagePath": "pages/mine/mine",
         "iconPath": "images/news/user.png",
         "selectedIconPath": "images/news/user_select.png",
-        "text": "个人"
+        "text": "我的"
       }
     ]
   },

pages/login/login.js

@@ -101,6 +101,7 @@ Page({
           })
         } else {
           wx.setStorageSync('channelIdObj', res.data)
+          wx.setStorageSync('channelName', that.data.account)
           wx.redirectTo({
             url: that.data.url,
           })

pages/mine/mine.js

@@ -58,7 +58,7 @@ Page({
         }
       ]
     },
-    channIdState:false, // 判断渠道是否登陆了,默认没有登陆
+    channelName:null, // 判断渠道是否登陆了,默认没有登陆
   },
 
   onLoad: function () {
@@ -122,14 +122,12 @@ Page({
     //   getApp().getUserRole(un_id);//获取用户角色
     //   userRole = getApp().globalData.userRole;
     // }
-    console.log(wx.getStorageSync('channelIdObj'),"ffffff")
     that.setData({
       userInfo: userInfo,
       userId: un_id,
       userRole: userRole,
-      channIdState: wx.getStorageSync('channelIdObj').channelAccountId ? true : false
+      channelName: wx.getStorageSync('channelName') ? wx.getStorageSync('channelName') : null
     })
-    console.log(that.data.channIdState)
   },
   orderList(e){
     console.log(e,"orderList")
@@ -173,8 +171,9 @@ Page({
   outChann(){ // 退出渠道
     wx.removeStorageSync('channelIdObj');
     this.setData({
-      channIdState:false
+      channelName:null
     })
+    wx.removeStorageSync('channelName')
   },
   channelInfo(){
     if (wx.getStorageSync('channelIdObj').channelAccountId){

pages/mine/mine.wxml

@@ -35,14 +35,14 @@
 </view>
 
   <!-- 我的定制订单 -->
- <view class='user-order'>
+ <!-- <view class='user-order'>
     <view class="pad-t20 pad-b20 mar-r20 f-s30 mar-l20 order-title f-box f-align-items-center">
       <view class='f-item'>{{madeList.label}}</view>
       <!-- <view class='f-s28 f-box f-align-items-center'>
         <view>{{madeList.summary}}</view>
         <icon class='{{madeList.icon}} iconfont'></icon>
       </view> -->
-    </view>
+    <!-- </view>
     <view class='f-box order-list f-justify-content-center mar-l20 mar-r20 f-s28'>
       <view class='f-item  order-item' wx:for="{{orderList.data}}" data-state="{{item.state}}" bindtap='madeList'>
         <text wx:if="{{item.num > 0 }}">{{item.num}}</text>
@@ -50,12 +50,12 @@
         <view>{{item.label}}</view>
       </view>
     </view>
-  </view>
+  </view>  -->
 
     <!-- 我的定制订单 -->
  <view class='user-order'>
     <view class="pad-t20 pad-b20 mar-r20 f-s30 mar-l20 order-title f-box f-align-items-center" bindtap='channelInfo'>
-      <view class='f-item'>{{channIdState ? '渠道信息' :'渠道登入'}}</view>
+      <view class='f-item'>{{channelName ? channelName :'vip账户'}}</view>
       <view class='f-s28 f-box f-align-items-center'>
         <icon class='{{madeList.icon}} iconfont'></icon>
       </view>

pages/orderList/orderList.js

@@ -13,6 +13,10 @@ Page({
         label: "待付款",
       },
       {
+        state: '2',
+        label: "待审核",
+      },
+      {
         state: '3',
         label: "待发货",
       },
@@ -22,7 +26,7 @@ Page({
       },
       {
         state: '5',
-        label: "待评价",
+        label: "已完成",
       }
     ],
     goodsList: [],

pages/orderList/orderList.wxml

@@ -16,7 +16,7 @@
     <view class='auto'>
       <view class='f-box pad-t20 pad-b20'>
         <view class='f-item'>订单：{{item.order_number}}</view>
-        <view wx:if="{{item.order_sta ==1}}">待审核</view>
+        <view wx:if="{{item.order_sta ==2}}">待审核</view>
         <view wx:if="{{item.order_sta ==3}}">审核通过</view>
         <view class='mar-l20' wx:if="{{item.list_order_aff_data[0].pay_order}}" data-src="{{item.list_order_aff_data[0].pay_order}}" bindtap='seePayOrder'>查看凭证</view>
       </view>
@@ -38,7 +38,7 @@
       <!-- 价格与按钮 -->
       <view class="f-box f-justify-content-center order-btn">
         <view class='f-item f-box f-justify-content-end mar-r26'>
-          <view class='btn' wx:if="{{item.order_sta ==1}}" data-index="{{index}}" data-orderId="{{item.order_number}}" bindtap='uploadImg'>{{item.list_order_aff_data[0].pay_order ? "修改凭证" :"上传凭证"}}</view>
+          <view class='btn' wx:if="{{item.order_sta ==1 || item.order_sta ==2}}" data-index="{{index}}" data-orderId="{{item.order_number}}" bindtap='uploadImg'>{{item.list_order_aff_data[0].pay_order ? "修改凭证" :"上传凭证"}}</view>
           <view class='btn' wx:if="{{item.order_sta ==4}}">查看物流</view>
           <view class='btn' wx:if="{{item.order_sta ==4}}">确认收货</view>
         </view>