wxd / MShopWeApp

Commit 1e723fe6f2605a28d29cf13822d2b5a8853c6d44

Authored by WXD-SEASON\season
2 parents a19e666d 02e661ba

Merge branch 'dev_oa_su6' into dev

Inline Side-by-side
Showing 23 changed files with 131 additions and 25 deletions
... ... @@ -989,7 +989,14 @@ App({
989 989 };
990 990 },
991 991 });
992   - };
  992 + }
  993 + else{
  994 + wx.showModal({
  995 + content: '商家未设置客服热线',
  996 + showCancel: 0,
  997 +
  998 + });
  999 + }
993 1000 });
994 1001 },
995 1002  
... ...
components/com_servicer/com_servicer.wxml
  View file @1e723fe
... ... @@ -5,7 +5,7 @@
5 5 <text class="iconfont icon-guan" bindtap="closeCS"></text>
6 6 </view>
7 7 <!-- 客服热线 -->
8   - <view class="pd20 bdt fs30 btn2" bindtap="contactService">
  8 + <view class="pd20 bdt fs30 btn2" bindtap="contactService" wx:if="{{store_tel}}">
9 9 <text class="iconfont icon-dianhua"></text>客服热线：
10 10 <text class="c-red">{{store_tel}}</text>
11 11 </view>
... ...
packageA/pages/goodsInfo/goodsInfo.wxml
  View file @1e723fe
... ... @@ -958,7 +958,7 @@
958 958 <text class="iconfont icon-guan" bindtap="closeCS"></text>
959 959 </view>
960 960 <!-- 客服热线 -->
961   - <view class="pd20 bdt fs30 btn2" bindtap="contactService">
  961 + <view class="pd20 bdt fs30 btn2" bindtap="contactService" wx:if="{{store_tel}}">
962 962 <text class="iconfont icon-dianhua"></text>客服热线：
963 963 <text class="c-red">{{store_tel}}</text>
964 964 </view>
... ...
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
  View file @1e723fe
... ... @@ -926,7 +926,7 @@
926 926 <text class="iconfont icon-guan" bindtap="closeCS"></text>
927 927 </view>
928 928 <!-- 客服热线 -->
929   - <view class="pd20 bdt fs30 btn2" bindtap="contactService">
  929 + <view class="pd20 bdt fs30 btn2" bindtap="contactService" wx:if="{{store_tel}}">
930 930 <text class="iconfont icon-dianhua"></text>客服热线：
931 931 <text class="c-red">{{store_tel}}</text>
932 932 </view>
... ...
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
  View file @1e723fe
... ... @@ -82,7 +82,17 @@ Page({
82 82 r.order_status_detail="待支付"; r.pay_btn=1;
83 83 }
84 84 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0)
85   - r.order_status_detail = "待发货";
  85 + {
  86 + //自提的话
  87 + if (r.exp_type==1)
  88 + {
  89 + r.order_status_detail = "待自提";
  90 + }
  91 + else
  92 + {
  93 + r.order_status_detail = "待发货";
  94 + }
  95 + }
86 96  
87 97 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){
88 98 r.order_status_detail = "待收货";r.receive_btn=1;
... ...
packageD/pages/AI-test-skin/analyse/analyse.js
  View file @1e723fe
... ... @@ -26,6 +26,7 @@ Page({
26 26 err_map: null,
27 27 skin_type: 0,
28 28 ce_user_id:0,
  29 + img_remark:''
29 30 },
30 31  
31 32 /**
... ... @@ -36,6 +37,7 @@ Page({
36 37 var plugin = requirePlugin('mtSkinSdk')
37 38 plugin.setConfig(pluginGD)
38 39 }
  40 + this.setData({img_remark:options.img_remark})
39 41  
40 42 if(options.ce_user_id)
41 43 this.data.ce_user_id=options.ce_user_id;
... ... @@ -519,6 +521,7 @@ Page({
519 521 resultjson: JSON.stringify(analyse_data),
520 522 detectjson: JSON.stringify(analyse_info),
521 523 skin_type: 1,
  524 + img_remark:th.data.img_remark
522 525 }
523 526 //要保存一下分析的结果
524 527 th.json_post("/api/weshop/face/storeSkinface/save", req_data, function (res) {
... ... @@ -556,6 +559,8 @@ Page({
556 559 resultjson: JSON.stringify(res.data.data),
557 560 detectjson: JSON.stringify(th.data.check_data),
558 561 skin_type: 0,
  562 + img_remark:th.data.img_remark
  563 +
559 564 }
560 565  
561 566 var txt=[];
... ...
packageD/pages/AI-test-skin/history_record/history_record.js
  View file @1e723fe
... ... @@ -203,6 +203,7 @@ Page({
203 203 for (let i = 0; i < data.length; i++) {
204 204 let history = data[i];
205 205 let id = history.id;
  206 + let img_remark = history.img_remark;
206 207 let now = new Date(history['addtime'] * 1000);
207 208 let year = now.getFullYear(); //年
208 209 let month = (now.getMonth() + 1).toString().padStart(2, 0); //月
... ... @@ -218,10 +219,12 @@ Page({
218 219 let obj = {
219 220 time,
220 221 id,
  222 + img_remark,
221 223 };
222 224 if (arr.length > 0) {
223 225 let index = arr.findIndex(item => {
224 226 return item['history_time'] === history_time;
  227 +
225 228 })
226 229 if (index > -1) {
227 230 arr[index]['time_arr'].push(obj);
... ...
packageD/pages/AI-test-skin/history_record/history_record.wxml
  View file @1e723fe
... ... @@ -14,9 +14,14 @@
14 14 <view class="history_list">
15 15 <view class="history_list_month" wx:for="{{history}}">
16 16 <view style="color:#333;font-size:26rpx;margin-top: 30rpx">{{item.history_time}}</view>
17   - <view class="souce" wx:for="{{item.time_arr}}" wx:for-item="subitem" bindtap="go_result" data-id="{{subitem.id}}" wx:for-index="subindex" wx:key="subindex">
  17 + <view wx:for="{{item.time_arr}}" wx:for-item="subitem" bindtap="go_result" data-id="{{subitem.id}}" wx:for-index="subindex" wx:key="subindex">
  18 +
  19 + <view class="pdt16 fs28" wx:if="{{subitem.img_remark}}">{{subitem.img_remark}}</view>
  20 + <view class="souce">
18 21 <view style="font-weight: 600;">{{subitem.time}}</view>
19 22 <view style="color: #9b9b9b;" >去查看<text style="font-size: 24rpx;" class="iconfont icon-arrow_right"></text></view>
  23 + </view>
  24 +
20 25 </view>
21 26 </view>
22 27 </view>
... ...
packageD/pages/AI-test-skin/select_photo/select_photo.js
  View file @1e723fe
... ... @@ -13,7 +13,8 @@ Page({
13 13 iurl: setting.imghost,
14 14 gl_skin_img: null,
15 15 skin_type: 0,
16   - ce_user_id:0
  16 + ce_user_id:0,
  17 + img_remark:''
17 18 },
18 19  
19 20 /**
... ... @@ -40,9 +41,13 @@ Page({
40 41 if (e.data.code == 0) {
41 42 getApp().globalData.face_img = e.data.data.img;
42 43 getApp().globalData.face_SourceImg = e.data.data.SourceImg;
43   - let url = "/packageD/pages/AI-test-skin/analyse/analyse"; //跳到分析页
  44 + var getimg_remark=th.data.img_remark;
  45 +
  46 +
  47 + let url = "/packageD/pages/AI-test-skin/analyse/analyse"; //跳到分析页
  48 + url+="?img_remark="+getimg_remark;
44 49 if(th.data.ce_user_id)
45   - url+="?ce_user_id="+th.data.ce_user_id;
  50 + url+="&ce_user_id="+th.data.ce_user_id;
46 51  
47 52 console.log("select_ph");
48 53 console.log(url);
... ... @@ -60,6 +65,20 @@ Page({
60 65 })
61 66  
62 67 },
  68 +
  69 + getInput(e) {
  70 + let val = e.detail.value;
  71 + if (val) {
  72 + this.setData({
  73 + img_remark: e.detail.value,
  74 + });
  75 + } else {
  76 + this.setData({
  77 + img_remark: '',
  78 + });
  79 + }
  80 +
  81 + },
63 82 //-- 重新从相册中选择图片 --
64 83 show_pai_pop: function () {
65 84 var th = this;
... ...
packageD/pages/AI-test-skin/select_photo/select_photo.wxml
  View file @1e723fe
... ... @@ -3,6 +3,11 @@
3 3 <image style="width: 100%;border-radius: 3%;" mode="widthFix" src="{{gl_skin_img['path']}}"></image>
4 4 <!-- <image wx:else style="width: 100%;border-radius: 3%;" mode="widthFix" src="{{gl_skin_img['path']}}"></image> -->
5 5 </view>
  6 +
  7 + <view>
  8 + <input class="inputclass" name="img_remark" value="" placeholder="请填写备注" bindinput="getInput"> </input>
  9 + </view>
  10 +
6 11 <view class="foot_btn">
7 12 <view class="reset_select" bindtap="takePhoto">
8 13 <text class="iconfont icon-zuojiantou" style="font-size: 40rpx"></text>
... ...
packageD/pages/AI-test-skin/select_photo/select_photo.wxss
  View file @1e723fe
... ... @@ -28,3 +28,13 @@ page {
28 28 /* margin: 0 auto; */
29 29 color: #fff;
30 30 }
  31 +
  32 +.inputclass{
  33 + width: 540rpx;
  34 + height: 55rpx;
  35 + line-height: 55rpx;
  36 + background-color: rgb(238, 238, 238);
  37 + border-radius: 6rpx;
  38 + padding-left: 40rpx;
  39 + padding-right: 15rpx;
  40 +}
31 41 \ No newline at end of file
... ...
packageD/pages/shop/order_detail/order_detail.js
  View file @1e723fe
... ... @@ -46,8 +46,17 @@ Page({
46 46 if (r.order_status == 0 && r.pay_status==0 ){
47 47 r.order_status_detail="待支付"; r.pay_btn=1;
48 48 }
49   - if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0)
50   - r.order_status_detail = "待发货";
  49 + if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0){
  50 + //自提的话
  51 + if (r.exp_type==1)
  52 + {
  53 + r.order_status_detail = "待自提";
  54 + }
  55 + else
  56 + {
  57 + r.order_status_detail = "待发货";
  58 + }
  59 + }
51 60  
52 61 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){
53 62 r.order_status_detail = "待收货";r.receive_btn=1;
... ...
packageE/pages/giftpack/giftpacklistshop/giftpacklistshop.wxss
  View file @1e723fe
... ... @@ -92,7 +92,8 @@
92 92 .box_ware_img image.data-v-3a5b7e36 {
93 93 /* width: 185rpx;
94 94 height: 190rpx; *//* background-color: rgba(138, 138, 138, 0.63); */
95   - border: 2rpx solid #999;
  95 + border: 2rpx solid #fafaf9;
  96 + border-radius: 4rpx;
96 97 width: 120rpx;
97 98 height: 120rpx;
98 99 background-color: #f8f8f8;
... ...
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxss
  View file @1e723fe
... ... @@ -92,7 +92,8 @@
92 92 .box_ware_img image.data-v-3a5b7e36 {
93 93 /* width: 185rpx;
94 94 height: 190rpx; *//* background-color: rgba(138, 138, 138, 0.63); */
95   - border: 2rpx solid #999;
  95 + border: 2rpx solid #fafaf9;
  96 + border-radius: 4rpx;
96 97 width: 120rpx;
97 98 height: 120rpx;
98 99 background-color: #f8f8f8;
... ...
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxss
  View file @1e723fe
... ... @@ -92,7 +92,8 @@
92 92 .box_ware_img image.data-v-3a5b7e36 {
93 93 /* width: 185rpx;
94 94 height: 190rpx; *//* background-color: rgba(138, 138, 138, 0.63); */
95   - border: 2rpx solid #999;
  95 + border: 2rpx solid #fafaf9;
  96 + border-radius: 4rpx;
96 97 width: 120rpx;
97 98 height: 120rpx;
98 99 background-color: #f8f8f8;
... ...
pages/cart/cart2_inte/cart2_inte.json 0 → 100644
  View file @1e723fe
  1 +{
  2 + "usingComponents": {}
  3 +}
0 4 \ No newline at end of file
... ...
pages/cart/cart2_inte/cart2_inte.wxss 0 → 100644
  View file @1e723fe
  1 +/* pages/cart/cart2_inte/cart2_inte.wxss */
0 2 \ No newline at end of file
... ...
pages/giftpack/giftpacklist/giftpacklist.wxss
  View file @1e723fe
... ... @@ -92,7 +92,8 @@
92 92 .box_ware_img image.data-v-3a5b7e36 {
93 93 /* width: 185rpx;
94 94 height: 190rpx; *//* background-color: rgba(138, 138, 138, 0.63); */
95   - border: 2rpx solid #999;
  95 + border: 2rpx solid #fafaf9;
  96 + border-radius: 4rpx;
96 97 width: 120rpx;
97 98 height: 120rpx;
98 99 background-color: #f8f8f8;
... ...
pages/user/assistance/giftpacklist.wxss
  View file @1e723fe
... ... @@ -93,7 +93,8 @@
93 93 .box_ware_img image.data-v-3a5b7e36 {
94 94 /* width: 185rpx;
95 95 height: 190rpx; *//* background-color: rgba(138, 138, 138, 0.63); */
96   - border: 2rpx solid #999;
  96 + border: 2rpx solid #fafaf9;
  97 + border-radius: 4rpx;
97 98 width: 120rpx;
98 99 height: 120rpx;
99 100 background-color:#f8f8f8;
... ...
pages/user/my_service/i_service.wxml
  View file @1e723fe
... ... @@ -34,7 +34,7 @@
34 34 </view>
35 35  
36 36 <view class="flex-center itemName">
37   - <view class="fs32 Name ellipsis-1">{{item.ServiceName}}</view>
  37 + <view class="fs30 Name ellipsis-2">{{item.ServiceName}}</view>
38 38 </view>
39 39  
40 40 <view class="flex-center fs24 itemCount">
... ...
pages/user/my_service/i_service.wxss
  View file @1e723fe
... ... @@ -25,7 +25,7 @@ page {
25 25 .rel {
26 26 background-color: rgb(255, 255, 255);
27 27 width: 346rpx;
28   - height: 430rpx;
  28 + min-height: 460rpx;
29 29 border-radius: 20rpx;
30 30 display: inline-block;
31 31 /* margin-right: 15rpx; */
... ... @@ -64,10 +64,11 @@ page {
64 64 .itemName {
65 65 margin-bottom: 25rpx;
66 66 color: rgb(48, 48, 48);
  67 + height: 64rpx;
67 68 }
68 69  
69 70 .itemName .Name {
70   - max-width: 250rpx;
  71 + max-width: 290rpx;
71 72 text-align: center;
72 73 }
73 74  
... ...
pages/user/order_detail/order_detail.js
  View file @1e723fe
... ... @@ -80,7 +80,15 @@ Page({
80 80 r.order_status_detail="待支付"; r.pay_btn=1;
81 81 }
82 82 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0)
83   - r.order_status_detail = "待发货";
  83 + //自提的话
  84 + if (r.exp_type==1)
  85 + {
  86 + r.order_status_detail = "待自提";
  87 + }
  88 + else
  89 + {
  90 + r.order_status_detail = "待发货";
  91 + }
84 92  
85 93 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){
86 94 r.order_status_detail = "待收货";r.receive_btn=1;
... ...
pages/user/order_list/order_list.wxml
  View file @1e723fe
... ... @@ -71,8 +71,14 @@
71 71 </block>
72 72  
73 73 <block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}">
74   - <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
75   - <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
  74 + <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">
  75 + <block wx:if="{{item.exp_type==1}}">待自提</block>
  76 + <block wx:else>待发货</block>
  77 + </view>
  78 + <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">
  79 + <block wx:if="{{item.exp_type==1}}">待自提</block>
  80 + <block wx:else>待发货</block>
  81 + </view>
76 82 <view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>
77 83 <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image>
78 84 </view>
... ... @@ -92,8 +98,14 @@
92 98 <view wx:if="{{item.is_back ==1 && item.pay_status ==1}}">已退款</view>
93 99 <view wx:elif="{{item.is_back == 0 && item.pay_status ==1 && item.team_status == 0}}">已支付,待成团</view>
94 100 <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
95   - <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}">待发货</view>
96   - <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}">待收货</view>
  101 + <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}">
  102 + <block wx:if="{{item.exp_type==1}}">待自提</block>
  103 + <block wx:else>待发货</block>
  104 + </view>
  105 + <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}">
  106 + <block wx:if="{{item.exp_type==1}}">待自提</block>
  107 + <block wx:else>待发货</block>
  108 + </view>
97 109 <view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>
98 110 <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image>
99 111 </view>
... ... @@ -109,7 +121,10 @@
109 121 <view wx:if="{{item.pt_status==1 && item.pt_prom_id>0}}">组团中</view>
110 122 <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
111 123 <block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}">
112   - <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
  124 + <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">
  125 + <block wx:if="{{item.exp_type==1}}">待自提</block>
  126 + <block wx:else>待发货</block>
  127 + </view>
113 128 <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
114 129 <view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>
115 130 <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image>
... ...