|
|
@@ -30,12 +30,14 @@
|
|
|
|
|
|
<view style="text-align:right;">
|
|
|
<view class="open-bx" >
|
|
|
- <i class="iconfont iconjian" @click="delItem(item)" v-if="item.bigCount > 0 || item.smallCount > 0"></i>
|
|
|
- <text class="num" @click="customUpdate(item)">
|
|
|
- <text v-if="item.bigCount > 0" style="font-size:24upx;font-weight:bold;color:#3385ff;">{{ item.bigCount }}</text>
|
|
|
- <text v-if="item.smallCount > 0" style="font-size:24upx;"><text v-if="item.bigCount > 0">/</text>{{ item.smallCount }}</text>
|
|
|
+ <text class="num">
|
|
|
+ <text v-if="item.bigCount > 0" style="font-size:24upx;font-weight:bold;color:#3385ff;">
|
|
|
+ {{ item.bigCount }}{{item.bigUnit}}
|
|
|
+ </text>
|
|
|
+ <text v-if="item.smallCount > 0" style="font-size:24upx;">
|
|
|
+ {{ item.smallCount }}{{item.smallUnit}}
|
|
|
+ </text>
|
|
|
</text>
|
|
|
- <i class="iconfont iconzeng" @click="addEvents(item)"></i>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
@@ -63,12 +65,12 @@
|
|
|
<text style="color: #3385FF;width:100%;">出车有经过或到店拿货的花店，免运费，请选【自取】</text>
|
|
|
</view>
|
|
|
<view v-else>
|
|
|
- <text style="width:100%;color:#CCCCCC;">使用跑腿，需要配送费</text>
|
|
|
+ <text style="width:100%;color:#CCCCCC;">需要配送费</text>
|
|
|
</view>
|
|
|
</tui-list-cell>
|
|
|
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.sendType == 3" @click="modifyAddress">
|
|
|
- <view class="tui-title">地址</view>
|
|
|
+ <view class="tui-title">收花地址</view>
|
|
|
<view v-if="!$util.isEmpty(shopInfo.lat) && !$util.isEmpty(shopInfo.long)">
|
|
|
<view><text>{{shopInfo.fullAddress}}</text></view>
|
|
|
<view><text>{{shopInfo.showAddress}}</text></view>
|
|
|
@@ -81,6 +83,11 @@
|
|
|
<text style="color: #3385FF">¥{{ form.sendCost }}</text>
|
|
|
</tui-list-cell>
|
|
|
|
|
|
+ <tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 3 && Number(form.packCost)>0">
|
|
|
+ <view class="tui-title">打包费</view>
|
|
|
+ <text style="color: #3385FF">¥{{ form.packCost }}</text>
|
|
|
+ </tui-list-cell>
|
|
|
+
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
|
|
|
<view class="tui-title">总金额</view>
|
|
|
<text style="color: #3385FF">¥{{ modifyPrice }}</text>
|
|
|
@@ -108,20 +115,6 @@
|
|
|
<button class="admin-button-com blue big" @click="affirmFormSubmit">提交</button>
|
|
|
</view>
|
|
|
|
|
|
- <modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
|
|
|
- <template slot="customContent">
|
|
|
- <view class="select-cmd_bx" v-if="customData">
|
|
|
- <view class="kc"> </view>
|
|
|
- <view class="num_bx">
|
|
|
- <input v-if="globalUnitType == 0" v-model="customData.bigCount" :focus="isFocus" type="number" placeholder="扎数" />
|
|
|
- <input v-if="globalUnitType == 1" v-model="customData.smallCount" :focus="isFocus" type="number" placeholder="支数" />
|
|
|
- <image @click="switchGlobalUnitType" :src="`${constant.imgUrl}/icon/switch/switch128.png`" v-if="customData.smallShow && customData.smallShow==1"
|
|
|
- style="width:86upx;height:86upx;position:absolute;top:136upx;right:55upx;" mode="widthFix"></image>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </template>
|
|
|
- </modal-module>
|
|
|
-
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
@@ -188,7 +181,8 @@ export default {
|
|
|
sendCost: 0,
|
|
|
customId: "",
|
|
|
product: "",
|
|
|
- hbId: '0'
|
|
|
+ hbId: '0',
|
|
|
+ packCost:0
|
|
|
},
|
|
|
showCustomer: false,
|
|
|
today:'',
|
|
|
@@ -407,6 +401,7 @@ export default {
|
|
|
getGhsData(id) {
|
|
|
getGhsDataApi({id:id}).then(res => {
|
|
|
this.ghsInfo = res.data
|
|
|
+ this.form.packCost = res.data.packCost?parseFloat(res.data.packCost):0
|
|
|
});
|
|
|
},
|
|
|
countAllPrices(e){
|
|
|
@@ -631,11 +626,9 @@ export default {
|
|
|
display: inline-block;
|
|
|
width: 120upx;
|
|
|
height:45upx;
|
|
|
- text-align:center;
|
|
|
+ text-align:right;
|
|
|
margin: 0 8upx;
|
|
|
color: #868686;
|
|
|
- border-radius: 22upx;
|
|
|
- background-color: #f5f5f5;
|
|
|
padding: 3upx 0;
|
|
|
font-size: 25upx;
|
|
|
}
|
