Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

WXD-SEASON\season
2 parents 04e5f512 55700795
Showing 28 changed files with 76 additions and 38 deletions
components/my_confirm/my_confirm.js
components/my_confirm/my_confirm.wxml
packageA/pages/jfbuy/jfbuy.wxml
packageA/pages/my_service/tment_eval.js
packageA/pages/my_service2/tment_eval.js
packageB/pages/evaluate/evaluate.js
packageB/pages/user/user_coupon/user_coupon.js
packageC/pages/presell/list/list.js
packageE/pages/qy/contactMe/contactMe.js
packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml
packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxss
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxss
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxss
packageE/pages/user/monthgiftbag/monthgiftbag.wxml
packageE/pages/user/monthgiftbag/monthgiftbag.wxss
packageE/pages/user/monthgiftbag/my_giftpackinfo/my_giftpackinfo.wxml
packageE/pages/user/monthgiftbag/my_giftpackinfo/my_giftpackinfo.wxss
packageE/pages/user/monthgiftbag/public/buy_com.wxml
@@ -10,6 +10,8 @@ Component({
     title: null, //标题
     s_text: null, //确定的提示语
     c_text: null, //取消的提示语
+
+    is_show_txt:0,
   },
   methods: {
@@ -22,6 +24,18 @@ Component({
       })
       this.data.success = success;
       this.data.cancle = cancle;
+
+
+      var ck1=title.indexOf('购买该礼包');
+      var ck2=title.indexOf('兑换该礼包');
+      var ck3=title.indexOf('领取该礼包');
+
+      if(ck1>0 || ck2>0 || ck3>0){
+        this.setData({
+          is_show_txt:1
+        })
+      }
+
     },
     open_cancel: function (yu_e_show){
          this.setData({
@@ -6,6 +6,7 @@
 			<view style="position: relative">
 				 <view class="shut" bindtap="close_yu_e">ⅹ</view>
 				 <view class="fs32 xc-black3 flex jc-center ai-center" style="padding: 10rpx 20rpx;min-height:220rpx;"><text>{{title}}</text></view>
+				 <view wx:if="{{is_show_txt}}"  class="fs24" style="color:#ff1a34;position: relative; left:20rpx;top:-20rpx">注：礼包采用虚拟发货形式，支付成功后即到账。</view>
 				 <view class="flex jc-center ai_center" style="width: 100%;height: 75rpx;">
 					   <view bindtap="go_sure" class="fs30 white flex jc-center ai-center ck_btn" style="margin-right: 20rpx;background:#ececea;">{{s_text}}</view>
 					 <view bindtap='go_cancle' class="fs30 xc-ash flex jc-center ai-center ck_btn color" >{{c_text}}</view>
@@ -64,11 +64,18 @@
 							<view class="ellipsis-2 fs30 name">{{item.name}}</view>
 							<view>
 								<view class="red">
-									<text>{{item.integral}}积分 + ￥{{item.addmoney}}</text>						
+									<block wx:if="{{item.integral>0 || item.addmoney>0 }}">
+										<text wx:if="{{item.integral>0}}">{{item.integral}}积分</text><text wx:if="{{item.integral>0 && item.addmoney>0}}"> +</text><text wx:if="{{item.addmoney>0}}">￥{{item.addmoney}}</text>
+									</block>
+									<block wx:else>
+										<text>0积分 + ￥0</text>
+									</block>					
 								</view>
 								<view class="pdt14 fs22 gray flex jc_sb">
 									<view><text wx:if="{{item.price_show==1}}">￥{{item.shop_price}}</text></view>
-									<view>销量：{{item.buy_num+item.virtual}}</view>
+									<block wx:if="{{item.buy_num+item.virtual>0}}">
+									  <view>销量：{{item.buy_num+item.virtual}}</view>
+									</block>
 								</view>
 							</view>
 						</view>
@@ -41,6 +41,7 @@ Page({
           data: {
             Star: index + 1,
             storeId: a.stoid,
+            TagID:'0C7EE27C-AA5F-4969-841A-CC994EF3B12E'//3.0默认综合评价
           }
         }).then(res => {
           if (res.data.code == 0) {
@@ -41,6 +41,7 @@ Page({
           data: {
             Star: index + 1,
             storeId: a.stoid,
+            TagID:'0C7EE27C-AA5F-4969-841A-CC994EF3B12E'//3.0默认综合评价
           }
         }).then(res => {
           if (res.data.code == 0) {
@@ -42,7 +42,8 @@ Page({
         getApp().request.promiseGet(url, {
           data: {
             Star: index + 1,
-            storeId: a.stoid
+            storeId: a.stoid,
+            TagID:'0C7EE27C-AA5F-4969-841A-CC994EF3B12E'//3.0默认综合评价
           }
         }).then(res => {
           if (res.data.code == 0) {
@@ -197,18 +197,21 @@ Page({
        success:function (e) {
            console.log(e);
            console.log('/code/get');
-           var  name= e.data.data.UseObjectName;
+          
            //--获取成功的时候--
-           if(e.data.code==0){
+           if(e.data.code==0 && e.data.data){
+
+                var  name= e.data.data.UseObjectName;
+
                var no=e.data.data.CashRepNo;
                var qc_com = th.selectComponent("#qc_com"); //组件的id
                var obj={val:no,content:"请将二维码展示给核销员，抵券更快捷",now: now, validay: validay, name: name,is_quan:1};
                qc_com.open(obj)
            }else{
-               var qt_txt = this.selectComponent("#pop_txt"); //组件的id
-               var ob={title:"温馨提示",content:"您暂时还没有该券"};
+               var qt_txt = th.selectComponent("#pop_txt"); //组件的id
+               var ob={title:"温馨提示",content:e.data.msg};
                qt_txt.open(ob);
            }
@@ -93,6 +93,7 @@ Page({
         //     }
         // }
+        this.setData({no_more: 0})
         this.get_list();
     },
@@ -78,7 +78,7 @@ Page({
       '86007': '不合法的群成员',
     },
   },
-  onLoad: function (tt) {
+  onLoad:async function (tt) {
     // tt.scene="0_0_16"
     if (tt && tt.scene) {
       var first_leader_str = decodeURIComponent(tt.scene);
@@ -93,6 +93,7 @@ Page({
         this.setData({
           id: f_arr[2]
         })
+        await  this.getopenuserid(f_arr[2])
         //判断是否有注册，如果没有注册必须先注册
         let userinfo = wx.getStorageSync('userinfo');
         if (!userinfo) {
@@ -106,7 +107,7 @@ Page({
             this.setData({
               phone:userinfo.mobile
             })     
-            this.getopenuserid(f_arr[2])
+           
           }else{
             wx.removeStorageSync('userinfo')
@@ -177,9 +178,9 @@ Page({
       })
       // wx.removeStorageSync('qyzsdg')
     }
-    if (this.data.id) {
-      this.getopenuserid(this.data.id)
-    }
+    // if (this.data.id) {
+    //   this.getopenuserid(this.data.id)
+    // }
   },
   getopenuserid(id) {
     let url = `/api/weshop/qyWeChat/qywxStaffcode/get/${id}`
@@ -28,8 +28,8 @@
 		<view class="content_box">
 			<view class="content_box_ware" catchtap="navigateTo" data-index="{{index}}" data-url="/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo?isBuy=1&id={{items.id}}&cover_img={{items.cover_img}}&orderSn=''">
 				<view class="content_box_img">
-					<image src="{{iurl+items.cover_img}}" lazy-load="true" binderror="bind_bnerr2" wx:if="{{items.cover_img}}" data-errorimg="wareCard[{{index}}].cover_img"></image>
-					<image src="{{iurl+items.lbUrl}}" lazy-load="true" binderror="bind_bnerr2" wx:else data-errorimg="wareCard[{{index}}].lbUrl"></image>
+					<image  mode="aspectFit"  src="{{iurl+items.cover_img}}" lazy-load="true" binderror="bind_bnerr2" wx:if="{{items.cover_img}}" data-errorimg="wareCard[{{index}}].cover_img"></image>
+					<image  mode="aspectFit"  src="{{iurl+items.lbUrl}}" lazy-load="true" binderror="bind_bnerr2" wx:else data-errorimg="wareCard[{{index}}].lbUrl"></image>
 				</view>
 				<view class="content_box_title">
 					<view class="content_ware_title">
@@ -81,8 +81,8 @@ page {
 }
 .content_box_img image {
-  width: 230rpx;
-  height: 230rpx;
+  max-width: 230rpx;
+  max-height: 230rpx;
 }
 .content_box_title {
@@ -2,7 +2,7 @@
 <wxs module="filter" src="../../../../../utils/filter.wxs"></wxs>
 <view class="box data-v-3a5b7e36" style="background-color:{{default_color?default_color:'#e85f93'}};min-height: 100vh;">
   <view class="box_top data-v-3a5b7e36">
-    <image  src="{{iurl}}{{monthgiftbag.cover_img}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image>
+    <image  src="{{iurl}}{{monthgiftbag.cover_img}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" mode="widthFix" data-errorimg="giftImage"></image>
   </view>
   <view class="box_title data-v-3a5b7e36" >
@@ -13,7 +13,7 @@
 .box_top image.data-v-3a5b7e36 {
   width: 100%;
-  max-height: 540rpx;
+  /* max-height: 540rpx; */
 }
 .box_title.data-v-3a5b7e36 {
@@ -4,7 +4,7 @@
 <view class="box data-v-3a5b7e36" style="background-color:{{default_color?default_color:'#e85f93'}}">
   <view class="box_top data-v-3a5b7e36">
-    <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image>
+    <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" mode="widthFix" data-errorimg="giftImage"></image>
   </view>
   <view class="box_title data-v-3a5b7e36" >
@@ -13,7 +13,7 @@
 .box_top image.data-v-3a5b7e36 {
   width: 100%;
-  max-height: 540rpx;
+  /* max-height: 540rpx; */
 }
 .box_title.data-v-3a5b7e36 {
@@ -30,8 +30,8 @@
             data-url="/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.receive_ordersn}}&record_list_id={{item.record_list_id}}&is_receive={{item.is_receive}}">
         <view class="content_box_img">
           <!-- <image src="{{$GetInfo.imgHttp+item.$orig.lbUrl}}"></image> -->
-          <image wx:if="{{item.cover_img}}" src="{{iurl+item.cover_img}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].cover_img"></image>
-          <image wx:else src="{{iurl+item.lbUrl}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].lbUrl"></image>
+          <image  mode="aspectFit"  wx:if="{{item.cover_img}}" src="{{iurl+item.cover_img}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].cover_img"></image>
+          <image  mode="aspectFit"  wx:else src="{{iurl+item.lbUrl}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].lbUrl"></image>
           <block wx:if="{{item.actType!=0}}">
             <view class="{{[item.actType==1?'content_box_img_title content_box_img_ground1':item.actType==2?'content_box_img_title content_box_img_ground2':item.actType==4?'content_box_img_title content_box_img_ground3':'content_box_img_title content_box_img_ground4']}}">
@@ -80,8 +80,8 @@
 }
 .content_box_img image {
-  width: 230rpx;
-  height: 230rpx;
+  max-width: 230rpx;
+  max-height: 230rpx;
 }
 .content_box_img_title {
@@ -4,7 +4,7 @@
 <view class="box data-v-3a5b7e36" style="background-color:{{default_color?default_color:'#e85f93'}};min-height: 100vh;">
   <view class="box_top data-v-3a5b7e36">
-    <image src="{{iurl}}{{monthgiftbag.cover_img}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr"
+    <image src="{{iurl}}{{monthgiftbag.cover_img}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" mode="widthFix" 
       data-errorimg="giftImage"></image>
   </view>
   <view class="box_title data-v-3a5b7e36">
@@ -18,7 +18,7 @@ page{
 .box_top image.data-v-3a5b7e36 {
   width: 100%;
-  max-height: 540rpx;
+  /* max-height: 540rpx; */
 }
 .box_title.data-v-3a5b7e36 {
@@ -252,6 +252,7 @@
                 </view>
               </block>
               <block wx:else>
+                <view class="fs28" style="padding:0 18rpx;color:#ff1a34">注：礼包采用虚拟发货形式，支付成功后即到账。</view>
                 <button  bindtap="buy_libao" disabled="{{submit}}" style="display: block" class="spec-cart-btn {{buyType==2?'yellow':'red-b'}} fs32" data-action="add">
                   <text wx:if="{{buyType==1}}">立即兑换</text>
                   <text wx:if="{{buyType==2}}">立即购买</text>
@@ -28,8 +28,8 @@
 		<view class="content_box">
 			<view class="content_box_ware" bindtap="navigateTo" data-url="/packageF/pages/giftpack/giftpacklist/giftpacklist?isBuy=1&lbId={{items.lbId}}&cover_img={{items.cover_img}}&orderSn=''">
 				<view class="content_box_img">
-					<image src="{{iurl+items.cover_img}}" lazy-load="true" binderror="bind_bnerr2" wx:if="{{items.cover_img}}" data-errorimg="wareCard[{{index}}].cover_img"></image>
-					<image src="{{iurl+items.lbUrl}}" lazy-load="true" binderror="bind_bnerr2" wx:else data-errorimg="wareCard[{{index}}].lbUrl"></image>
+					<image mode="aspectFit" src="{{iurl+items.cover_img}}" lazy-load="true" binderror="bind_bnerr2" wx:if="{{items.cover_img}}" data-errorimg="wareCard[{{index}}].cover_img"></image>
+					<image mode="aspectFit" src="{{iurl+items.lbUrl}}" lazy-load="true" binderror="bind_bnerr2" wx:else data-errorimg="wareCard[{{index}}].lbUrl"></image>
 				</view>
 				<view class="content_box_title">
 					<view class="content_ware_title">
@@ -78,11 +78,13 @@ page {
   display: flex;
   font-size: 8rpx;
   position: relative;
+  width: 230rpx;
+  height: 230rpx;
 }
 .content_box_img image {
-  width: 230rpx;
-  height: 230rpx;
+  max-width: 100%;
+  max-height: 100%;
 }
 .content_box_title {
@@ -3,7 +3,7 @@
 <view class="box data-v-3a5b7e36" style="background-color:{{default_color?default_color:'#e85f93'}}">
   <view class="box_top data-v-3a5b7e36">
-    <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image>
+    <image mode="widthFix" src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image>
   </view>
   <view class="box_title data-v-3a5b7e36" >
@@ -13,7 +13,7 @@
 .box_top image.data-v-3a5b7e36 {
   width: 100%;
-  max-height: 540rpx;
+  /* max-height: 540rpx; */
 }
 .box_title.data-v-3a5b7e36 {
@@ -27,8 +27,8 @@
       <view class="content_box_ware" bindtap="navigateTo" data-is_back="{{item.is_back}}" data-url="/packageF/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.orderSn}}">
         <view class="content_box_img">
           <!-- <image src="{{$GetInfo.imgHttp+item.$orig.lbUrl}}"></image> -->
-          <image wx:if="{{item.cover_img}}" src="{{iurl+item.cover_img}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].cover_img"></image>
-          <image wx:else src="{{iurl+item.lbUrl}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].lbUrl"></image>
+          <image mode="aspectFit" wx:if="{{item.cover_img}}" src="{{iurl+item.cover_img}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].cover_img"></image>
+          <image mode="aspectFit" wx:else src="{{iurl+item.lbUrl}}" lazy-load="true" binderror="bind_bnerr2"  data-errorimg="wareCard[{{index}}].lbUrl"></image>
           <block wx:if="{{item.actType!=0}}">
             <view class="{{[item.actType==1?'content_box_img_title content_box_img_ground1':item.actType==2?'content_box_img_title content_box_img_ground2':item.actType==4?'content_box_img_title content_box_img_ground3':'content_box_img_title content_box_img_ground4']}}">
@@ -77,11 +77,12 @@
   display: flex;
   font-size: 8rpx;
   position: relative;
+  width: 230rpx;
+  height: 230rpx;
 }
 .content_box_img image {
-  width: 230rpx;
-  height: 230rpx;
+   max-width: 100%; max-height: 100%;
 }
 .content_box_img_title {
@@ -40,7 +40,8 @@ Page({
         getApp().request.promiseGet(url, {
           data: {
             Star: index + 1,
-            storeId: a.stoid
+            storeId: a.stoid,
+            TagID:'0C7EE27C-AA5F-4969-841A-CC994EF3B12E'//3.0默认综合评价
           }
         }).then(res => {
           if (res.data.code == 0) {
@@ -152,7 +152,7 @@
     <view class="pding">
       <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
       <view class="spec-goods">
-        <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{iurl+(sele_g.cover_img?sele_g.cover_img:sele_g.lbUrl)}}" binderror="pop_err_img" data-errorimg=""></image>
+        <image mode="aspectFit" style="max-width: 100%;max-height: 100%;" class="spec-img xc-distance-bottom" bindtap="previewImage" src="{{iurl+(sele_g.cover_img?sele_g.cover_img:sele_g.lbUrl)}}" binderror="pop_err_img" data-errorimg=""></image>
         <view class="spec-goods-info">
           <view class="spec-goods-name ellipsis-2">{{sele_g.giftTitle}}</view>
           <view class="flex ai_end xc-val-money" wx:if="{{buyType<4}}">
@@ -246,6 +246,9 @@
                 </view>
               </block>
               <block wx:else>
+
+                <view class="fs28" style="padding:0 18rpx;color:#ff1a34">注：礼包采用虚拟发货形式，支付成功后即到账。</view>
+
                 <button  bindtap="buy_libao" disabled="{{submit}}" style="display: block" class="spec-cart-btn {{buyType==2?'yellow':'red-b'}} fs32" data-action="add">
                   <text wx:if="{{buyType==1}}">立即兑换</text>
                   <text wx:if="{{buyType==2}}">立即购买</text>