Browse Source

💄 门店检查-添加图片/视频的图标问题

谢创宏 3 years ago
parent
commit
76191a520e

+ 4 - 1
pages/clientInfo/clientInfo.js

@@ -27,6 +27,8 @@ Page({
27
     calendarConfig: {
27
     calendarConfig: {
28
       takeoverTap: true,
28
       takeoverTap: true,
29
     },
29
     },
30
+    userId: '',
31
+    orderId: '',
30
     list: [],
32
     list: [],
31
     total: 0,
33
     total: 0,
32
     page: 1,
34
     page: 1,
@@ -40,7 +42,8 @@ Page({
40
     console.log(options)
42
     console.log(options)
41
     if(options.userId) {
43
     if(options.userId) {
42
       this.setData({
44
       this.setData({
43
-        userId: options.userId
45
+        userId: options.userId,
46
+        orderId: options.orderId,
44
       },() => {
47
       },() => {
45
         // this.getUserInfo()
48
         // this.getUserInfo()
46
         this.getfeedbackList()
49
         this.getfeedbackList()

+ 4 - 1
pages/clientInfo/clientInfo.wxml

@@ -52,7 +52,10 @@
52
   <view class="border-radius padding list">
52
   <view class="border-radius padding list">
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
-      <!-- <view class="btn flex-center">订单</view> -->
55
+      <!-- orderId=339 -->
56
+      <navigator url="/pages/orderDetail/orderDetail?orderId={{orderId}}" hover-class="none">
57
+        <view class="btn flex-center">订单</view>
58
+      </navigator>
56
     </view>
59
     </view>
57
     <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">
58
       <view class="user-info flex-align-center">
61
       <view class="user-info flex-align-center">

+ 4 - 4
pages/feedback/feedback.js

@@ -42,19 +42,19 @@ Page({
42
     raterList: [
42
     raterList: [
43
       {
43
       {
44
         text: '整体满意度',
44
         text: '整体满意度',
45
-        num: 1
45
+        num: 5
46
       },
46
       },
47
       {
47
       {
48
         text: '效果认可度',
48
         text: '效果认可度',
49
-        num: 2
49
+        num: 5
50
       },
50
       },
51
       {
51
       {
52
         text: '价格接受度',
52
         text: '价格接受度',
53
-        num: 3
53
+        num: 5
54
       },
54
       },
55
       {
55
       {
56
         text: '类别满意度',
56
         text: '类别满意度',
57
-        num: 4
57
+        num: 5
58
       },
58
       },
59
       {
59
       {
60
         text: '安全认可度',
60
         text: '安全认可度',

+ 3 - 1
pages/home/home.js

@@ -195,8 +195,10 @@ Page({
195
    * 跳转客户信息
195
    * 跳转客户信息
196
   */
196
   */
197
   goToClientInfo(e) {
197
   goToClientInfo(e) {
198
+    console.log(e)
199
+    // return;
198
     wx.navigateTo({
200
     wx.navigateTo({
199
-      url: `/pages/clientInfo/clientInfo?userId=${e.currentTarget.dataset.id}`,
201
+      url: `/pages/clientInfo/clientInfo?userId=${e.currentTarget.dataset.userid}&orderId=${e.currentTarget.dataset.orderid}`,
200
     })
202
     })
201
   },
203
   },
202
 
204
 

+ 1 - 1
pages/home/home.wxml

@@ -50,7 +50,7 @@
50
         </view>
50
         </view>
51
         <view class="item-btn flex-align-center flex-justify-space-between">
51
         <view class="item-btn flex-align-center flex-justify-space-between">
52
           <view class="btn flex-center">订单详情</view>
52
           <view class="btn flex-center">订单详情</view>
53
-          <view class="btn flex-center" data-id="{{ item.user_id }}" catchtap="goToClientInfo">客户信息</view>
53
+          <view class="btn flex-center" data-orderid="{{ item.order_id }}" data-userid="{{ item.user_id }}" catchtap="goToClientInfo">客户信息</view>
54
           <view class="btn flex-center" data-item="{{ item }}" catchtap="goToFeedback">记录反馈</view>
54
           <view class="btn flex-center" data-item="{{ item }}" catchtap="goToFeedback">记录反馈</view>
55
           <!-- <navigator url="/pages/clientInfo/clientInfo?userId={{ item.user_id }}" hover-class="none">
55
           <!-- <navigator url="/pages/clientInfo/clientInfo?userId={{ item.user_id }}" hover-class="none">
56
             <view class="btn flex-center" data-id="{{ item.user_id }}" catchtap="goToClientInfo">客户信息</view>
56
             <view class="btn flex-center" data-id="{{ item.user_id }}" catchtap="goToClientInfo">客户信息</view>

+ 1 - 1
pages/login/login.wxss

@@ -11,7 +11,7 @@ page,.content {
11
   height: 84rpx;
11
   height: 84rpx;
12
   background-color: #12B311;
12
   background-color: #12B311;
13
   color: #fff;
13
   color: #fff;
14
-  font-size: 32rpx;
14
+  font-size: 30rpx;
15
   border-radius: 4rpx;
15
   border-radius: 4rpx;
16
 }
16
 }
17
 
17
 

+ 2 - 2
pages/recordSheet/components/inspect/inspect.wxml

@@ -117,11 +117,11 @@
117
             </view>
117
             </view>
118
             
118
             
119
             <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9 &&imgs[0].type != 'video' }}" bindtap="chooseVideo">
119
             <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9 &&imgs[0].type != 'video' }}" bindtap="chooseVideo">
120
-              <image src=""></image>
120
+              <image src="/images/icon_06.png"></image>
121
               <text style="font-size: 28rpx;">添加视频</text>
121
               <text style="font-size: 28rpx;">添加视频</text>
122
             </view>
122
             </view>
123
             <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9}}" bindtap="chooseImage">
123
             <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9}}" bindtap="chooseImage">
124
-              <image src=""></image>
124
+              <image src="/images/icon_07.png"></image>
125
               <text style="font-size: 28rpx;">添加图片</text>
125
               <text style="font-size: 28rpx;">添加图片</text>
126
             </view>
126
             </view>
127
           </view>
127
           </view>

+ 1 - 1
pages/recordSheet/components/inspect/inspect.wxss

@@ -133,7 +133,7 @@
133
 .change-img .upload image {
133
 .change-img .upload image {
134
   width: 48rpx;
134
   width: 48rpx;
135
   height: 48rpx;
135
   height: 48rpx;
136
-  background-color: #ccc;
136
+  /* background-color: #ccc; */
137
   margin-bottom: 6rpx;
137
   margin-bottom: 6rpx;
138
 }
138
 }
139
 
139
 

+ 2 - 2
pages/recordSheet/components/review/review.wxml

@@ -117,11 +117,11 @@
117
             </view>
117
             </view>
118
             
118
             
119
             <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9 &&imgs[0].type != 'video' }}" bindtap="chooseVideo">
119
             <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9 &&imgs[0].type != 'video' }}" bindtap="chooseVideo">
120
-              <image src=""></image>
120
+              <image src="/images/icon_06.png"></image>
121
               <text style="font-size: 28rpx;">添加视频</text>
121
               <text style="font-size: 28rpx;">添加视频</text>
122
             </view>
122
             </view>
123
             <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9}}" bindtap="chooseImage">
123
             <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9}}" bindtap="chooseImage">
124
-              <image src=""></image>
124
+              <image src="/images/icon_07.png"></image>
125
               <text style="font-size: 28rpx;">添加图片</text>
125
               <text style="font-size: 28rpx;">添加图片</text>
126
             </view>
126
             </view>
127
           </view>
127
           </view>

+ 1 - 1
pages/recordSheet/components/review/review.wxss

@@ -133,7 +133,7 @@
133
 .change-img .upload image {
133
 .change-img .upload image {
134
   width: 48rpx;
134
   width: 48rpx;
135
   height: 48rpx;
135
   height: 48rpx;
136
-  background-color: #ccc;
136
+  /* background-color: #ccc; */
137
   margin-bottom: 6rpx;
137
   margin-bottom: 6rpx;
138
 }
138
 }
139
 
139
 

+ 2 - 2
pages/recordSheet/components/verify/verify.wxml

@@ -117,11 +117,11 @@
117
             </view>
117
             </view>
118
             
118
             
119
             <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9 &&imgs[0].type != 'video' }}" bindtap="chooseVideo">
119
             <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9 &&imgs[0].type != 'video' }}" bindtap="chooseVideo">
120
-              <image src=""></image>
120
+              <image src="/images/icon_06.png"></image>
121
               <text style="font-size: 28rpx;">添加视频</text>
121
               <text style="font-size: 28rpx;">添加视频</text>
122
             </view>
122
             </view>
123
             <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9}}" bindtap="chooseImage">
123
             <view class="item upload flex-column flex-center" wx:if="{{ imgs.length < 9}}" bindtap="chooseImage">
124
-              <image src=""></image>
124
+              <image src="/images/icon_07.png"></image>
125
               <text style="font-size: 28rpx;">添加图片</text>
125
               <text style="font-size: 28rpx;">添加图片</text>
126
             </view>
126
             </view>
127
           </view>
127
           </view>

+ 1 - 1
pages/recordSheet/components/verify/verify.wxss

@@ -133,7 +133,7 @@
133
 .change-img .upload image {
133
 .change-img .upload image {
134
   width: 48rpx;
134
   width: 48rpx;
135
   height: 48rpx;
135
   height: 48rpx;
136
-  background-color: #ccc;
136
+  /* background-color: #ccc; */
137
   margin-bottom: 6rpx;
137
   margin-bottom: 6rpx;
138
 }
138
 }
139
 
139
 

+ 1 - 1
pages/recordSheet/recordSheet.wxss

@@ -124,7 +124,7 @@
124
 .change-img .upload image {
124
 .change-img .upload image {
125
   width: 48rpx;
125
   width: 48rpx;
126
   height: 48rpx;
126
   height: 48rpx;
127
-  background-color: #ccc;
127
+  /* background-color: #ccc; */
128
   margin-bottom: 6rpx;
128
   margin-bottom: 6rpx;
129
 }
129
 }
130
 
130