wxd / MShopWeApp

Commit c44fa002425e2c08b5c95934ca4e0e7f2f1045b5

Authored by 后端研发-苏明海
2 parents 89312b3e 52d80ff7

Merge branch 'dev' into 'test' 

Dev

See merge request !874
Inline Side-by-side
Showing 8 changed files with 29 additions and 83 deletions
pages/goods/goodsInfo/goodsInfo.js
  View file @c44fa00
... ... @@ -1061,7 +1061,7 @@ Page({
1061 1061 if (this.data.prom_type == 1 || this.data.prom_type == 2) {
1062 1062 this.getactLen(function (num) {
1063 1063 if (num < th.data.goodsInputNum) {
1064   - getApp().my_warnning("秒杀库存不足!", 0, th);
  1064 + getApp().my_warnning("活动库存不足!", 0, th);
1065 1065 return false;
1066 1066 } else {
1067 1067 th.add_cart_func(t);
... ...
pages/goods/goodsList/goodsList.js
  View file @c44fa00
... ... @@ -233,7 +233,7 @@ Page({
233 233 var rd= {
234 234 store_id: oo.stoid,
235 235 presell_id: presell_id,
236   - goods_id: val.goods_id
  236 + goods_id: item.goods_id
237 237 }
238 238 //------获取预售从表----------
239 239 await getApp().request.promiseGet(url1, {
... ...
pages/team/team_show/team_show.js
  View file @c44fa00
... ... @@ -270,14 +270,11 @@ Page({
270 270 var num = this.data.num;
271 271 var ii = this.data.ii;
272 272 var minusStatus = num > 1 ? 'normal' : 'disable';
273   - if (ii == 0) {
274   - getApp().showWarning("请选择门店"); return false;
275   - }
276   - if (ii == 1) {
  273 +
277 274 num++;
278 275 //要判断库存数量，限购数量
279 276 th.check_num(num,minusStatus);
280   - }
  277 +
281 278 },
282 279  
283 280 async check_num(num,minusStatus){
... ...
pages/team/team_show/team_show.wxml
  View file @c44fa00
... ... @@ -255,7 +255,7 @@
255 255 <view class="count">
256 256 <view bindtap="{{num <= 1 ? '':'bindMinus'}}" class="sub {{num <= 1 ? 'active':''}}">-</view>
257 257 <!-- <view class='{{minusStatus}}' bindtap="bindMinus" class="sub">-</view> -->
258   - <input bindblur="bindManual" class="xc-val-fream" type="number" value="1">1</input>
  258 + <input bindblur="bindManual" class="xc-val-fream" type="number" value="{{num}}">1</input>
259 259 <view bindtap="bindPlus" class="add">+</view>
260 260 </view>
261 261 </view>
... ...
pages/user/coupons/coupons.js
  View file @c44fa00
... ... @@ -188,7 +188,7 @@ Page({
188 188 */
189 189 qrcode:function(val){
190 190 // console.log(val);
191   - // barcode('barcode', val, 600,160);
  191 + barcode('barcode', val, 600,160);
192 192 qrcode('qrcode', val, 300, 300);
193 193 },
194 194  
... ...
pages/user/coupons/coupons.wxml
  View file @c44fa00
... ... @@ -165,14 +165,18 @@
165 165 {{filter.getNum(details[useIndex].Sum)}}元微券
166 166 </block>
167 167 </view>
168   - <view class="pdt20 c-fe0000"><text class="rmb fs80" wx:if="{{details[useIndex].isby != 1}}">{{filter.getNum(details[useIndex].Sum)}}</text></view>
169   - <!-- <img src="" alt="" class="img-qr"/> -->
  168 + <!-- <view class="pdt20 c-fe0000"><text class="rmb fs80" wx:if="{{details[useIndex].isby != 1}}">{{filter.getNum(details[useIndex].Sum)}}</text></view> -->
  169 + <!-- 条形码 -->
  170 + <view class="bar-container">
  171 + <canvas class="barcode" canvas-id="barcode"/>
  172 + <view class="pdt20 fs26" wx:if="{{details[useIndex].CashRepNo}}">{{details[useIndex].CashRepNo}}</view>
  173 + <view class="pdt20 fs26" wx:else>{{details[useIndex].no}}</view>
  174 + </view>
  175 + <!-- 二维码 -->
170 176 <view class="qr-container">
171 177 <canvas class="qrcode" canvas-id="qrcode"/>
172 178 </view>
173   - <view class="pdt20 pdb10 fs26" wx:if="{{details[useIndex].CashRepNo}}">{{details[useIndex].CashRepNo}}</view>
174   - <view class="pdt20 pdb10 fs26" wx:else>{{details[useIndex].no}}</view>
175   - <view class="pdv30 c-7b fs26 bdt">
  179 + <view class="pdb30 c-7b fs26 bdt">
176 180 <text wx:if="{{details[useIndex].ValidDate}}" class="ellipsis-1x">有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}}</text>
177 181 <text wx:elif="{{details[useIndex].use_end_time}}" class="ellipsis-1x">有效期:{{details[useIndex].use_start_time==null ? " " : time.format_time(details[useIndex].use_start_time)}} 至 {{time.format_time(details[useIndex].use_end_time)}}</text>
178 182 <text wx:else>有效期:不限</text>
... ... @@ -181,62 +185,5 @@
181 185 </view>
182 186  
183 187  
184   -<!-- <block wx:for="{{details}}" wx:for-index="idx" wx:for-item="detail">
185   -
186   - <block wx:if="{{detail.isby}}"> -->
187   - <!-- 判断有没有数据有显示没有不显示 -->
188   - <!-- <view class="data" data-cashrepno='{{detail.no}}' bindtap='click'>
189   - <view class="code_rim">
190   - <canvas class="code" canvas-id="qrcode{{idx}}" />
191   - <view class="code_val">{{detail.no}}</view>
192   - </view>
193   -
194   - <view class="moneys">包邮券</view>
195   - <view class="car-rim">
196   - <view class="text">微券来源: 微信商城</view>
197   - <view wx:if="{{detail.use_end_time!=null}}"> -->
198   - <!-- 不指定格式则默认输出：yyyy-MM-dd hh:mm:ss 格式 -->
199   - <!-- <view class="text">有效期:
200   - {{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}}
201   - 至 {{ time.format_time(detail.use_end_time)}}</view>
202   - </view>
203   - <view wx:else>
204   - <view class="text">有效期: 不限</view>
205   - </view>
206   - <view class="textss">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?",不包邮地区:"+detail.title:""}}
207   - </view>
208   - </view>
209   - </view>
210   -
211   -
212   -
213   - </block>
214   - <block wx:else> -->
215   - <!-- 判断有没有数据有显示没有不显示 -->
216   - <!-- <view class="data" data-cashrepno='{{detail.CashRepNo}}' bindtap='click'>
217   - <view class="code_rim">
218   - <canvas class="code" canvas-id="qrcode{{idx}}" />
219   - <view class="code_val">{{detail.CashRepNo}}</view>
220   - </view>
221   -
222   - <view class="moneys">{{filter.getNum(detail.Sum)}}元微券</view>
223   - <view class="car-rim">
224   - <view class="text">
225   - 微券来源: {{detail.SendMan==null?'线下发放':detail.SendMan==''?"线下发放":detail.SendMan}}</view>
226   - <view wx:if="{{detail.ValidDate!=null}}"> -->
227   - <!-- 不指定格式则默认输出：yyyy-MM-dd hh:mm:ss 格式 -->
228   - <!-- <view class="text">有效期:
229   - {{detail.BeginDate==null?" " : time.replace_time2(detail.BeginDate)}}
230   - 至 {{ time.replace_time2(detail.ValidDate)}}</view>
231   - </view>
232   - <view wx:else>
233   - <view class="text">有效期: 不限</view>
234   - </view>
235   - <view wx:if="{{detail.Remark1}}" class="textss"> {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}</view>
236   - <view wx:else class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}
237   - </view>
238   - </view>
239   - </view>
240   - </block>
241   -</block> -->
  188 +
242 189  
... ...
pages/user/coupons/coupons.wxss
  View file @c44fa00
... ... @@ -322,12 +322,12 @@ color:#999999;
322 322 font-family:'SimHei',Arial;
323 323 }
324 324 /* 点击条形 */
  325 +.bar-container {
  326 + padding: 40rpx 20rpx 20rpx 20rpx;
  327 +}
325 328 .barcode {
326   - height: 320rpx;
327   - flex-direction: column;
328   - justify-content: center;
329   - align-items: center;
330   - margin-left: 30rpx;
  329 + width: 100%;
  330 + height: 100rpx;
331 331 }
332 332 /* 二维码边框*/
333 333 .qrcode_rim {
... ...
pages/user/order_list/order_list.wxml
  View file @c44fa00
... ... @@ -97,6 +97,7 @@
97 97 <image src="{{resourceUrl+goods.original_img}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
98 98 <view class="abs flex-center fs26" wx:if="{{goods.prom_type==1}}">秒杀</view>
99 99 <view class="abs flex-center fs26" wx:if="{{goods.prom_type==6}}">团购</view>
  100 + <view class="abs flex-center fs26" wx:if="{{goods.prom_type==9}}">幸运购</view>
100 101 </navigator>
101 102 <!-- 商品内容 -->
102 103 <view class="Commodity_content">
... ... @@ -179,11 +180,11 @@
179 180 </view>
180 181 </view>
181 182 <view class="links flex-right-vertical fs24 padding">
182   - <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1)}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
  183 + <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1 && !(item.order_goods[0].prom_type==9))}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
183 184 <view bindtap="cancelOrder" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}" wx:if="{{(item.order_status==0 &&item.pay_status==0)}}">取消订单</view>
184 185 <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
185 186 <!---has_rt部分退---->
186   - <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1}}">
  187 + <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1 && !(item.order_goods[0].prom_type==9)}}">
187 188 <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==0&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
188 189 <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==1&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
189 190 </block>
... ... @@ -194,8 +195,9 @@
194 195 </block>
195 196 <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
196 197 <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
197   -
198   - <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}">订单详情</navigator>
  198 +
  199 + <navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}" wx:if="{{item.order_goods[0].prom_type==9}}">订单详情</navigator>
  200 + <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator>
199 201  
200 202 <block wx:if="{{!(item.has_rt || item.return_btn==2 || item.return_btn==4)}}">
201 203 <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="commodity_To_evaluate flex-level comment_go" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
... ... @@ -221,9 +223,9 @@
221 223 <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="jumpToCart4" data-idx="{{index}}" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">立即支付</navigator>
222 224  
223 225 <!-- 积分购 拼团 搭配购没有有再来一单 -->
224   - <block wx:if="{{(item.pay_status==1 || item.order_status==3) && !item.presell && item.pt_prom_id<=0 && item.integral<=0 && item.order_goods[0].prom_type!=5 }}">
  226 + <block wx:if="{{(item.pay_status==1 || item.order_status==3) && !item.presell && item.pt_prom_id<=0 && item.integral<=0 && item.order_goods[0].prom_type!=5 && !(item.order_goods[0].prom_type==9)}}">
225 227 <view bindtap="moreOrder" class="commodity_To_evaluate flex-level comment_go"
226   - data-index="{{index}}" >再来一单</view>
  228 + data-index="{{index}}">再来一单</view>
227 229 </block>
228 230  
229 231  
... ...