admin/lichebao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

非直营店，老订单去掉水平业务

Browse Source
This commit is contained in:
老叶
2022-02-24 17:33:47 +08:00
parent f1a03674e1
commit 0e5716edab
3 changed files with 74 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/index/index.js
+3 -3
View File
@@ -270,9 +270,9 @@ Page({
//公众号关注组件
officialaccount(e){
if(e.detail.status == 0&&!app.getStorageByKey("stopNotice")&&!this.data.isShowReport){
this.setData({
isShowNotice:true,
})
// this.setData({
// isShowNotice:true,
// })
}
},
pages/order/edit/index.js
+2 -2
View File
@@ -445,7 +445,7 @@ Page({
icon: 'none'
})
}
else if(this.data.srv_ids.length == 0 && this.data.userInfo.biz_type != 3){
else if(this.data.srv_ids.length == 0 && this.data.userInfo.biz_type == 1){
wx.showToast({
title: '请选择代办内容',
icon: 'none'
@@ -855,7 +855,7 @@ Page({
if(that.data.fine_ids.length>0){
params['fine_ids'] = that.data.fine_ids;
}
if(that.data.priceinfo.fine_money){
if(that.data.priceinfo.fine_money && that.data.userInfo.biz_type == 1){
params['if_fine'] = that.data.if_fine?'1':'0';
if(that.data.if_fine&&that.data.disc_fine_money!= ''){
params['disc_fine_money'] = that.data.disc_fine_money;
pages/order/edit/index.wxml
+69 -65
View File
@@ -114,53 +114,55 @@
<view class="absolute right-0 box-middle font-28 color-666">元</view>
</view>
</view>
<view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.fine_money}}">
<view class="absolute left-0 box-middle">精品尊享包<text class="ml10 font-24">{{priceinfo.fine_money}}元</text></view>
<view class="relative pt30 pb30 text-right" bindtap="changeFineBag">
<checkbox value="{{if_fine}}" checked="{{if_fine}}"/>
</view>
</view>
<view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{if_fine&&priceinfo.dis_fine_money}}">
<view class="absolute left-0 box-middle">精品优惠</view>
<view class="relative pr40">
<input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入精品优惠金额" bindinput='inputDiscFine' data-key="disc_fine_money" name='disc_fine_money' value="{{disc_fine_money}}" />
<view class="absolute right-0 box-middle font-28 color-666">元</view>
</view>
</view>
<view class="bbs-1-eb last-b-none">
<view class="relative pl190">
<view class="absolute left-0 box-middle font-28 color-333">代办相关<text class="color-f9394d" wx:if="{{userInfo.biz_type != 3}}">*</text></view>
<view class="pt30 pb30 text-right font-28 color-666">
总计：<text class="color-f9394d">{{srv_total}}</text>元
<block wx:if="{{userInfo.biz_type == 1}}">
<view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.fine_money}}">
<view class="absolute left-0 box-middle">精品尊享包<text class="ml10 font-24">{{priceinfo.fine_money}}元</text></view>
<view class="relative pt30 pb30 text-right" bindtap="changeFineBag">
<checkbox value="{{if_fine}}" checked="{{if_fine}}"/>
</view>
</view>
<view class="pb10 fn-clear">
<checkbox-group bindchange="changeAgency">
<block wx:for="{{agencyList}}" wx:key='index'>
<label class="fn-fl block mb20 wp31 relative inner30 bg-f6 font-28 ulib-r10 {{(index+1)%3==0?'':'mr20'}}">
<text>{{item.title}}</text>
<checkbox class="absolute right-0 box-middle mr15" value="{{item.id}}" checked="{{item.checked}}"/>
</label>
</block>
</checkbox-group>
</view>
</view>
<view class="bbs-1-eb last-b-none">
<view class="relative pl190">
<view class="absolute left-0 box-middle font-28 color-333">精品赠送</view>
<view class="pt30 pb30 text-right font-28 color-666">
精品价值：<text class="color-f9394d">{{fine_total}}</text>元
<view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{if_fine&&priceinfo.dis_fine_money}}">
<view class="absolute left-0 box-middle">精品优惠</view>
<view class="relative pr40">
<input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入精品优惠金额" bindinput='inputDiscFine' data-key="disc_fine_money" name='disc_fine_money' value="{{disc_fine_money}}" />
<view class="absolute right-0 box-middle font-28 color-666">元</view>
</view>
</view>
<view class="pb10">
<block wx:for="{{fineList}}" wx:key='index'>
<view class="block mb20 relative inner30 bg-f6 font-28 ulib-r10" bindtap="changeFine" data-index="{{index}}">
<text>{{item.title}}</text>
<checkbox class="absolute right-0 box-middle mr15" value="{{item.id}}" checked="{{item.checked}}"/>
</view>
</block>
<view class="bbs-1-eb last-b-none">
<view class="relative pl190">
<view class="absolute left-0 box-middle font-28 color-333">代办相关<text class="color-f9394d" wx:if="{{userInfo.biz_type != 3}}">*</text></view>
<view class="pt30 pb30 text-right font-28 color-666">
总计：<text class="color-f9394d">{{srv_total}}</text>元
</view>
</view>
<view class="pb10 fn-clear">
<checkbox-group bindchange="changeAgency">
<block wx:for="{{agencyList}}" wx:key='index'>
<label class="fn-fl block mb20 wp31 relative inner30 bg-f6 font-28 ulib-r10 {{(index+1)%3==0?'':'mr20'}}">
<text>{{item.title}}</text>
<checkbox class="absolute right-0 box-middle mr15" value="{{item.id}}" checked="{{item.checked}}"/>
</label>
</block>
</checkbox-group>
</view>
</view>
</view>
<view class="bbs-1-eb last-b-none">
<view class="relative pl190">
<view class="absolute left-0 box-middle font-28 color-333">精品赠送</view>
<view class="pt30 pb30 text-right font-28 color-666">
精品价值：<text class="color-f9394d">{{fine_total}}</text>元
</view>
</view>
<view class="pb10">
<block wx:for="{{fineList}}" wx:key='index'>
<view class="block mb20 relative inner30 bg-f6 font-28 ulib-r10" bindtap="changeFine" data-index="{{index}}">
<text>{{item.title}}</text>
<checkbox class="absolute right-0 box-middle mr15" value="{{item.id}}" checked="{{item.checked}}"/>
</view>
</block>
</view>
</view>
</block>
</view>
</view>
@@ -223,31 +225,33 @@
<view class="absolute left-0 box-middle font-28 color-333">车身优惠</view>
<view class="pt30 pb30 text-right font-28 color-f9394d" style="min-height:38rpx;">{{disc_money}}元</view>
</view>
<view class="mt40 font-32">其他信息</view>
<view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{if_fine}}">
<view class="absolute left-0 box-middle font-28 color-333">精品尊享包</view>
<view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">{{priceinfo.fine_money}}元</view>
</view>
<view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{disc_fine_money != ''}}">
<view class="absolute left-0 box-middle font-28 color-333">精品优惠</view>
<view class="pt30 pb30 text-right font-28 color-f9394d" style="min-height:38rpx;">{{disc_fine_money}}元</view>
</view>
<view class="relative bbs-1-eb pl190 last-b-none">
<view class="absolute left-0 box-middle font-28 color-333">代办相关</view>
<view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">
<block wx:for="{{agencyList}}" wx:key='index'>
<text class="pl10" wx:if="{{item.checked}}">{{item.title}}</text>
</block>
<block wx:if="{{userInfo.biz_type == 1}}">
<view class="mt40 font-32">其他信息</view>
<view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{if_fine}}">
<view class="absolute left-0 box-middle font-28 color-333">精品尊享包</view>
<view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">{{priceinfo.fine_money}}元</view>
</view>
</view>
<view class="relative bbs-1-eb pl190 last-b-none">
<view class="absolute left-0 box-middle font-28 color-333">精品赠送</view>
<view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">
<block wx:for="{{fineList}}" wx:key='index'>
<text class="pl10" wx:if="{{item.checked}}">{{item.title}}</text>
</block>
<view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{disc_fine_money != ''}}">
<view class="absolute left-0 box-middle font-28 color-333">精品优惠</view>
<view class="pt30 pb30 text-right font-28 color-f9394d" style="min-height:38rpx;">{{disc_fine_money}}元</view>
</view>
</view>
<view class="relative bbs-1-eb pl190 last-b-none">
<view class="absolute left-0 box-middle font-28 color-333">代办相关</view>
<view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">
<block wx:for="{{agencyList}}" wx:key='index'>
<text class="pl10" wx:if="{{item.checked}}">{{item.title}}</text>
</block>
</view>
</view>
<view class="relative bbs-1-eb pl190 last-b-none">
<view class="absolute left-0 box-middle font-28 color-333">精品赠送</view>
<view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">
<block wx:for="{{fineList}}" wx:key='index'>
<text class="pl10" wx:if="{{item.checked}}">{{item.title}}</text>
</block>
</view>
</view>
</block>
<view class="fixed left-0 right-0 bottom-0 bg-fff-op90 inner40 fn-flex safe-pb">
<button class="wp100 bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" hover-class="btn-36afa2-hover" bindtap="optPreview">重新编辑</button>
<button class="wp100 btn-36afa2 ml20 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppCusorder2">确认编辑</button>