|
|
@@ -51,19 +51,19 @@
|
|
|
|
|
|
<block v-if="ghsInfo.pfLevel && ghsInfo.pfLevel == 1">
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
|
|
|
- <button class="admin-button-com middle" :class="[form.transType == 0 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:52upx;" @click="changeTransType(0)">德邦空运</button>
|
|
|
- <button class="admin-button-com middle" :class="[form.transType == 1 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:52upx;" @click="changeTransType(1)">顺丰空运</button>
|
|
|
- <button class="admin-button-com middle" :class="[form.transType == 2 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:52upx;" @click="changeTransType(2)">冷链物流</button>
|
|
|
- <button class="admin-button-com middle" :class="[form.transType == 3 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:52upx;" @click="changeTransType(3)">航空物流</button>
|
|
|
+ <button class="admin-button-com middle" :class="[form.transType == 0 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;" @click="changeTransType(0)">德邦空运</button>
|
|
|
+ <button class="admin-button-com middle" :class="[form.transType == 1 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;" @click="changeTransType(1)">顺丰空运</button>
|
|
|
+ <button class="admin-button-com middle" :class="[form.transType == 2 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;" @click="changeTransType(2)">冷链物流</button>
|
|
|
+ <button class="admin-button-com middle" :class="[form.transType == 3 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;" @click="changeTransType(3)">航空物流</button>
|
|
|
</tui-list-cell>
|
|
|
</block>
|
|
|
<block v-else>
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
|
|
|
- <button v-if="ghsInfo.shopId != 4608" class="admin-button-com middle" :class="[form.sendType == 0 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:30upx;" @click="changeSendType(0)">送货上门</button>
|
|
|
- <button class="admin-button-com middle" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:52upx;" @click="changeSendType(1)">自取</button>
|
|
|
- <button class="admin-button-com middle" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:52upx;" @click="changeSendType(2)">跑腿</button>
|
|
|
- <button class="admin-button-com middle" :class="[form.sendType == 4 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:52upx;" @click="changeSendType(4)">快递</button>
|
|
|
- <button class="admin-button-com middle" :class="[form.sendType == 3 ? 'blue' : 'default']" style="width:160upx;height:100upx;line-height:52upx;" @click="changeSendType(3)">物流</button>
|
|
|
+ <button class="admin-button-com middle" :class="[form.sendType == 0 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;" @click="changeSendType(0)" v-if="ghsInfo.shopId != 4608">送货上门</button>
|
|
|
+ <button class="admin-button-com middle" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(1)">自取</button>
|
|
|
+ <button class="admin-button-com middle" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(2)">跑腿</button>
|
|
|
+ <button class="admin-button-com middle" :class="[form.sendType == 4 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(4)">快递</button>
|
|
|
+ <button class="admin-button-com middle" :class="[form.sendType == 3 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(3)">物流</button>
|
|
|
</tui-list-cell>
|
|
|
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false">
|
|
|
@@ -207,6 +207,7 @@ export default {
|
|
|
receiveLong: "",
|
|
|
receiveLat: "",
|
|
|
sendType: 0,
|
|
|
+ transType:0,
|
|
|
sendDate: "",
|
|
|
sendTimeWant: "",
|
|
|
sendCost: 0,
|
|
|
@@ -395,6 +396,25 @@ export default {
|
|
|
that.ghsInfo = res.data;
|
|
|
that.form.wlName = res.data.customWlName ? res.data.customWlName : ''
|
|
|
that.lackExpend = res.data.lackExpend?parseFloat(res.data.lackExpend):0
|
|
|
+
|
|
|
+ if(that.ghsInfo.pfLevel && that.ghsInfo.pfLevel == 1){
|
|
|
+ //昆明发货到全国
|
|
|
+ let packCost = 0
|
|
|
+ let weight = this.allCountFun.weight ? this.allCountFun.weight : 0
|
|
|
+ if (that.getDictionariesInfo.kmPackCost && !this.$util.isEmpty(that.getDictionariesInfo.kmPackCost)){
|
|
|
+ for (const ele of that.getDictionariesInfo.kmPackCost) {
|
|
|
+ let flagWeight = ele.num?ele.num:0
|
|
|
+ if(Number(flagWeight)>=Number(weight)){
|
|
|
+ that.form.packCost = ele.amount?parseFloat(Number(ele.amount)):0
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ //同城配送
|
|
|
+ that.form.packCost = res.data.packCost?parseFloat(res.data.packCost):0
|
|
|
+ }
|
|
|
+
|
|
|
});
|
|
|
},
|
|
|
countAllPrices(e){
|
|
|
@@ -445,7 +465,7 @@ export default {
|
|
|
},
|
|
|
affirmFormSubmit(){
|
|
|
const product = this.selectList.map(ele => {
|
|
|
- return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount,classId:ele.classId,itemId:ele.itemId };
|
|
|
+ return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount,classId:ele.classId,itemId:ele.itemId,weight:ele.weight };
|
|
|
});
|
|
|
if (this.$util.isEmpty(product)){
|
|
|
this.$msg('请选择花材')
|
|
|
@@ -459,11 +479,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(this.sendTimeWant==''){
|
|
|
- this.$msg('请选择配送时间')
|
|
|
- return false
|
|
|
- }
|
|
|
-
|
|
|
let xj = []
|
|
|
this.selectList.forEach((item) => {
|
|
|
let hasItem = uni.getStorageSync("ghsColorItem"+this.ghsInfo.id+"_"+item.itemId)
|
|
|
@@ -473,6 +488,7 @@ export default {
|
|
|
})
|
|
|
let params = {
|
|
|
sendType:this.form.sendType,
|
|
|
+ transType:this.form.transType,
|
|
|
sendTimeWant:this.sendTimeWant,
|
|
|
sendCost:0,
|
|
|
remark:this.remark,
|
