Browse Source

🔧 切换环境

谢创宏 3 years ago
parent
commit
99808de7ec

+ 5 - 2
pages/clientInfo/clientInfo.wxml

@@ -53,9 +53,9 @@
53
     <view class="item-top flex-align-center">
53
     <view class="item-top flex-align-center">
54
       <text class="flex1">反馈记录</text>
54
       <text class="flex1">反馈记录</text>
55
       <!-- orderId=339 -->
55
       <!-- orderId=339 -->
56
-      <navigator url="/pages/orderDetail/orderDetail?orderId={{orderId}}" hover-class="none">
56
+      <!-- <navigator url="/pages/orderDetail/orderDetail?orderId={{orderId}}" hover-class="none">
57
         <view class="btn flex-center">订单</view>
57
         <view class="btn flex-center">订单</view>
58
-      </navigator>
58
+      </navigator> -->
59
     </view>
59
     </view>
60
     <view class="item flex-column" wx:for="{{ list }}" wx:for-index="idx" wx:key="index">
60
     <view class="item flex-column" wx:for="{{ list }}" wx:for-index="idx" wx:key="index">
61
       <view class="user-info flex-align-center">
61
       <view class="user-info flex-align-center">
@@ -64,6 +64,9 @@
64
           <text style="font-size: 28rpx;margin-bottom: 6rpx;">{{ item.nickname }}</text>
64
           <text style="font-size: 28rpx;margin-bottom: 6rpx;">{{ item.nickname }}</text>
65
           <text style="font-size: 20rpx;color: #999;">{{ item.create_time }}</text>
65
           <text style="font-size: 20rpx;color: #999;">{{ item.create_time }}</text>
66
         </view>
66
         </view>
67
+        <navigator url="/pages/orderDetail/orderDetail?orderId={{item.order_id}}" hover-class="none">
68
+          <view class="btn flex-center">订单</view>
69
+        </navigator>
67
         <!-- <view class="more flex-align-center flex-justify-space-between" bindtap="onEditItem">
70
         <!-- <view class="more flex-align-center flex-justify-space-between" bindtap="onEditItem">
68
           <text></text>
71
           <text></text>
69
           <text></text>
72
           <text></text>

+ 9 - 0
pages/clientInfo/clientInfo.wxss

@@ -119,6 +119,15 @@
119
   font-size: 28rpx;
119
   font-size: 28rpx;
120
 }
120
 }
121
 
121
 
122
+.list .user-info .btn {
123
+  width: 154rpx;
124
+  height: 52rpx;
125
+  border-radius: 26rpx;
126
+  border: 2rpx solid #333333;
127
+  box-sizing: border-box;
128
+  font-size: 28rpx;
129
+}
130
+
122
 .list .user-info {
131
 .list .user-info {
123
   margin-bottom: 20rpx;
132
   margin-bottom: 20rpx;
124
 }
133
 }

+ 1 - 0
pages/member/member.wxml

@@ -94,6 +94,7 @@
94
       <view class="item line">
94
       <view class="item line">
95
         <image class="icon-left" src="/images/icon_tools_04.png"></image>
95
         <image class="icon-left" src="/images/icon_tools_04.png"></image>
96
         <text class="flex1">切换角色</text>
96
         <text class="flex1">切换角色</text>
97
+        <text class="active" style="color:#999999;" wx:if="{{ userInfo.role_name }}">{{ userInfo.role_name }}</text>
97
         <image class="icon-right" src="/images/right.png"></image>
98
         <image class="icon-right" src="/images/right.png"></image>
98
       </view>
99
       </view>
99
     </navigator>
100
     </navigator>

+ 2 - 2
utils/http.js

@@ -11,8 +11,8 @@ export function post(url,params, success = noop, fail = noop) {
11
 function noop() {}
11
 function noop() {}
12
 
12
 
13
 function http(url,method,params, success, fail) {
13
 function http(url,method,params, success, fail) {
14
-  const type = wx.getStorageSync('env') || 'dev';              // 测试环境
15
-  // const type = wx.getStorageSync('env') || 'ijolijoli';     // 正式环境
14
+  // const type = wx.getStorageSync('env') || 'dev';              // 测试环境
15
+  const type = wx.getStorageSync('env') || 'ijolijoli';     // 正式环境
16
   switch(type) {
16
   switch(type) {
17
     case 'dev':
17
     case 'dev':
18
       api_url = 'https://store.test-api.ijolijoli.com/'
18
       api_url = 'https://store.test-api.ijolijoli.com/'