Merge branch 'dev_oa_su6' into dev

WXD-SEASON\season
2 parents a19e666d 02e661ba
Showing 23 changed files with 131 additions and 25 deletions
app.js
components/com_servicer/com_servicer.wxml
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
packageD/pages/AI-test-skin/analyse/analyse.js
packageD/pages/AI-test-skin/history_record/history_record.js
packageD/pages/AI-test-skin/history_record/history_record.wxml
packageD/pages/AI-test-skin/select_photo/select_photo.js
packageD/pages/AI-test-skin/select_photo/select_photo.wxml
packageD/pages/AI-test-skin/select_photo/select_photo.wxss
packageD/pages/shop/order_detail/order_detail.js
packageE/pages/giftpack/giftpacklistshop/giftpacklistshop.wxss
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxss
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxss
pages/cart/cart2_inte/cart2_inte.json
pages/cart/cart2_inte/cart2_inte.wxss
pages/giftpack/giftpacklist/giftpacklist.wxss
pages/user/assistance/giftpacklist.wxss
pages/user/my_service/i_service.wxml
@@ -989,7 +989,14 @@ App({
                             };
                         },
                     });
-                };
+                }
+                else{
+                  wx.showModal({
+                    content: '商家未设置客服热线',
+                    showCancel: 0,
+                   
+                });
+                }
             });
     },
@@ -5,7 +5,7 @@
 		<text class="iconfont icon-guan" bindtap="closeCS"></text>
 	</view>
 	<!-- 客服热线 -->
-	<view class="pd20 bdt fs30 btn2" bindtap="contactService">
+	<view class="pd20 bdt fs30 btn2" bindtap="contactService" wx:if="{{store_tel}}">
 		<text class="iconfont icon-dianhua"></text>客服热线：
 		<text class="c-red">{{store_tel}}</text>
 	</view>
@@ -958,7 +958,7 @@
 		<text class="iconfont icon-guan" bindtap="closeCS"></text>
 	</view>
 	<!-- 客服热线 -->
-	<view class="pd20 bdt fs30 btn2" bindtap="contactService">
+	<view class="pd20 bdt fs30 btn2" bindtap="contactService" wx:if="{{store_tel}}">
 		<text class="iconfont icon-dianhua"></text>客服热线：
 		<text class="c-red">{{store_tel}}</text>
 	</view>
@@ -926,7 +926,7 @@
 		<text class="iconfont icon-guan" bindtap="closeCS"></text>
 	</view>
 	<!-- 客服热线 -->
-	<view class="pd20 bdt fs30 btn2" bindtap="contactService">
+	<view class="pd20 bdt fs30 btn2" bindtap="contactService" wx:if="{{store_tel}}">
 		<text class="iconfont icon-dianhua"></text>客服热线：
 		<text class="c-red">{{store_tel}}</text>
 	</view>
@@ -82,7 +82,17 @@ Page({
                     r.order_status_detail="待支付"; r.pay_btn=1;
                 }
                 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0)
-                   r.order_status_detail = "待发货";
+                {
+                  //自提的话
+                  if (r.exp_type==1)
+                  {
+                   r.order_status_detail = "待自提";
+                  }
+                  else
+                  {
+                    r.order_status_detail = "待发货";
+                  }
+                }
                 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){
                     r.order_status_detail = "待收货";r.receive_btn=1;
@@ -26,6 +26,7 @@ Page({
         err_map: null,
         skin_type: 0,
         ce_user_id:0,
+        img_remark:''
     },
     /**
@@ -36,6 +37,7 @@ Page({
             var plugin = requirePlugin('mtSkinSdk')
             plugin.setConfig(pluginGD)
         }
+        this.setData({img_remark:options.img_remark})
         if(options.ce_user_id)
             this.data.ce_user_id=options.ce_user_id;
@@ -519,6 +521,7 @@ Page({
                     resultjson: JSON.stringify(analyse_data),
                     detectjson: JSON.stringify(analyse_info),
                     skin_type: 1,
+                    img_remark:th.data.img_remark
                 }
                 //要保存一下分析的结果
                 th.json_post("/api/weshop/face/storeSkinface/save", req_data, function (res) {
@@ -556,6 +559,8 @@ Page({
                     resultjson: JSON.stringify(res.data.data),
                     detectjson: JSON.stringify(th.data.check_data),
                     skin_type: 0,
+                    img_remark:th.data.img_remark
+
                 }
                 var txt=[];
@@ -203,6 +203,7 @@ Page({
         for (let i = 0; i < data.length; i++) {
             let history = data[i];
             let id = history.id;
+            let img_remark = history.img_remark;
             let now = new Date(history['addtime'] * 1000);
             let year = now.getFullYear(); //年
             let month = (now.getMonth() + 1).toString().padStart(2, 0); //月
@@ -218,10 +219,12 @@ Page({
             let obj = {
                 time,
                 id,
+                img_remark,
             };
             if (arr.length > 0) {
                 let index = arr.findIndex(item => {
                     return item['history_time'] === history_time;
+                    
                 })
                 if (index > -1) {
                     arr[index]['time_arr'].push(obj);
@@ -14,9 +14,14 @@
     <view class="history_list">
         <view class="history_list_month" wx:for="{{history}}">
             <view style="color:#333;font-size:26rpx;margin-top: 30rpx">{{item.history_time}}</view>
-            <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">
+            <view  wx:for="{{item.time_arr}}" wx:for-item="subitem" bindtap="go_result" data-id="{{subitem.id}}" wx:for-index="subindex" wx:key="subindex">
+
+              <view class="pdt16 fs28" wx:if="{{subitem.img_remark}}">{{subitem.img_remark}}</view>
+              <view class="souce">
                 <view style="font-weight: 600;">{{subitem.time}}</view>
                 <view style="color: #9b9b9b;" >去查看<text style="font-size: 24rpx;" class="iconfont icon-arrow_right"></text></view>
+              </view>
+            
             </view>
         </view>
     </view>
@@ -13,7 +13,8 @@ Page({
         iurl: setting.imghost,
         gl_skin_img: null,
         skin_type: 0,
-        ce_user_id:0
+        ce_user_id:0,
+        img_remark:''
     },
     /**
@@ -40,9 +41,13 @@ Page({
                     if (e.data.code == 0) {
                         getApp().globalData.face_img = e.data.data.img;
                         getApp().globalData.face_SourceImg = e.data.data.SourceImg;
-                        let url = "/packageD/pages/AI-test-skin/analyse/analyse"; //跳到分析页
+                        var getimg_remark=th.data.img_remark;
+
+                       
+                        let url = "/packageD/pages/AI-test-skin/analyse/analyse"; //跳到分析页                      
+                          url+="?img_remark="+getimg_remark;                      
                         if(th.data.ce_user_id)
-                            url+="?ce_user_id="+th.data.ce_user_id;
+                            url+="&ce_user_id="+th.data.ce_user_id;
                         console.log("select_ph");
                         console.log(url);
@@ -60,6 +65,20 @@ Page({
         })
     },
+
+    getInput(e) {
+      let val = e.detail.value;
+      if (val) {
+          this.setData({
+             img_remark: e.detail.value,
+          });
+      } else {
+          this.setData({
+            img_remark: '',
+          });
+      }
+
+  },
     //-- 重新从相册中选择图片 --
     show_pai_pop: function () {
         var th = this;
@@ -3,6 +3,11 @@
         <image style="width: 100%;border-radius: 3%;" mode="widthFix" src="{{gl_skin_img['path']}}"></image>
         <!-- <image wx:else style="width: 100%;border-radius: 3%;" mode="widthFix" src="{{gl_skin_img['path']}}"></image> -->
     </view>
+ 
+      <view>
+       <input class="inputclass" name="img_remark" value="" placeholder="请填写备注" bindinput="getInput"> </input>
+        </view>
+    
     <view class="foot_btn">
         <view class="reset_select" bindtap="takePhoto">
             <text class="iconfont icon-zuojiantou" style="font-size: 40rpx"></text>
@@ -28,3 +28,13 @@ page {
     /* margin: 0 auto; */
     color: #fff;
 }
+
+.inputclass{
+  width: 540rpx;
+  height: 55rpx;
+  line-height: 55rpx;
+  background-color: rgb(238, 238, 238);
+  border-radius: 6rpx;
+  padding-left: 40rpx;
+  padding-right: 15rpx;
+}
 \ No newline at end of file
@@ -46,8 +46,17 @@ Page({
                 if (r.order_status == 0 && r.pay_status==0 ){
                     r.order_status_detail="待支付"; r.pay_btn=1;
                 }
-                if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0)
-                   r.order_status_detail = "待发货";
+                if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0){
+                   //自提的话
+                   if (r.exp_type==1)
+                   {
+                    r.order_status_detail = "待自提";
+                   }
+                   else
+                   {
+                     r.order_status_detail = "待发货";
+                   }
+                  }
                 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){
                     r.order_status_detail = "待收货";r.receive_btn=1;
@@ -92,7 +92,8 @@
 .box_ware_img image.data-v-3a5b7e36 {
   /* width: 185rpx;
 	height: 190rpx; *//* background-color: rgba(138, 138, 138, 0.63); */
-  border: 2rpx solid #999;
+  border: 2rpx solid #fafaf9;
+  border-radius: 4rpx;
   width: 120rpx;
   height: 120rpx;
   background-color: #f8f8f8;
@@ -92,7 +92,8 @@
 .box_ware_img image.data-v-3a5b7e36 {
   /* width: 185rpx;
 	height: 190rpx; *//* background-color: rgba(138, 138, 138, 0.63); */
-  border: 2rpx solid #999;
+  border: 2rpx solid #fafaf9;
+  border-radius: 4rpx;
   width: 120rpx;
   height: 120rpx;
   background-color: #f8f8f8;
@@ -92,7 +92,8 @@
 .box_ware_img image.data-v-3a5b7e36 {
   /* width: 185rpx;
 	height: 190rpx; *//* background-color: rgba(138, 138, 138, 0.63); */
-  border: 2rpx solid #999;
+  border: 2rpx solid #fafaf9;
+  border-radius: 4rpx;
   width: 120rpx;
   height: 120rpx;
   background-color: #f8f8f8;
+{
+  "usingComponents": {}
+}
 \ No newline at end of file
+/* pages/cart/cart2_inte/cart2_inte.wxss */
 \ No newline at end of file
@@ -92,7 +92,8 @@
 .box_ware_img image.data-v-3a5b7e36 {
   /* width: 185rpx;
 	height: 190rpx; *//* background-color: rgba(138, 138, 138, 0.63); */
-  border: 2rpx solid #999;
+  border: 2rpx solid #fafaf9;
+  border-radius: 4rpx;
   width: 120rpx;
   height: 120rpx;
   background-color: #f8f8f8;
@@ -93,7 +93,8 @@
 .box_ware_img image.data-v-3a5b7e36 {
   /* width: 185rpx;
 	height: 190rpx; *//* background-color: rgba(138, 138, 138, 0.63); */
-  border: 2rpx solid #999;
+  border: 2rpx solid #fafaf9;
+  border-radius: 4rpx;
   width: 120rpx;
   height: 120rpx;
   background-color:#f8f8f8; 
@@ -34,7 +34,7 @@
 		    </view>
 		    <view class="flex-center itemName">
-		      <view class="fs32 Name ellipsis-1">{{item.ServiceName}}</view>
+		      <view class="fs30 Name ellipsis-2">{{item.ServiceName}}</view>
 		    </view>
 		    <view class="flex-center fs24 itemCount">
@@ -25,7 +25,7 @@ page {
 .rel {
   background-color: rgb(255, 255, 255);
   width: 346rpx;
-  height: 430rpx;
+  min-height: 460rpx;
   border-radius: 20rpx;
   display: inline-block;
   /* margin-right: 15rpx; */
@@ -64,10 +64,11 @@ page {
 .itemName {
   margin-bottom: 25rpx;
   color: rgb(48, 48, 48);
+  height: 64rpx;
 }
 .itemName .Name {
-  max-width: 250rpx;
+  max-width: 290rpx;
   text-align: center;
 }
@@ -80,7 +80,15 @@ Page({
                     r.order_status_detail="待支付"; r.pay_btn=1;
                 }
                 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status== 0)
-                   r.order_status_detail = "待发货";
+                //自提的话
+                   if (r.exp_type==1)
+                   {
+                    r.order_status_detail = "待自提";
+                   }
+                   else
+                   {
+                     r.order_status_detail = "待发货";
+                   }
                 if (r.order_status == 1 && r.pay_status == 1 && r.shipping_status == 1){
                     r.order_status_detail = "待收货";r.receive_btn=1;
@@ -71,8 +71,14 @@
 				</block>
 				<block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}">
-					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
-					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
+					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">
+            <block wx:if="{{item.exp_type==1}}">待自提</block>
+            <block wx:else>待发货</block>
+          </view>
+					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">
+            <block wx:if="{{item.exp_type==1}}">待自提</block>
+            <block wx:else>待发货</block>
+          </view>
 					<view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>
 						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
           </view>
@@ -92,8 +98,14 @@
 				<view wx:if="{{item.is_back ==1 && item.pay_status ==1}}">已退款</view>
 				<view wx:elif="{{item.is_back == 0 && item.pay_status ==1 && item.team_status == 0}}">已支付,待成团</view>
 				<view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
-				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}">待发货</view>
-				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}">待收货</view>
+				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}">
+          <block wx:if="{{item.exp_type==1}}">待自提</block>
+            <block wx:else>待发货</block>
+        </view>
+				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}">
+          <block wx:if="{{item.exp_type==1}}">待自提</block>
+            <block wx:else>待发货</block>
+        </view>
 				<view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>      
 					<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
         </view>
@@ -109,7 +121,10 @@
 				<view wx:if="{{item.pt_status==1 && item.pt_prom_id>0}}">组团中</view>
 				<view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
 				<block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}">
-					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
+					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">
+            <block wx:if="{{item.exp_type==1}}">待自提</block>
+            <block wx:else>待发货</block>
+          </view>
 					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
 					<view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>
 						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>