|
|
@@ -128,7 +128,13 @@
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
|
|
|
<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)" v-if="ghsInfo.shopId != 14248">跑腿</button>
|
|
|
+ <template v-if="ghsInfo.shopId != 14248">
|
|
|
+ <view v-if="ghsInfo.openIntraCity==1" style="position:relative;display:inline-block;">
|
|
|
+ <button class="admin-button-com middle" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(2)">跑腿</button>
|
|
|
+ <text style="position:absolute;top:-10upx;left:50%;transform:translateX(-50%);background-color:#ff4d4f;color:#fff;font-size:20upx;padding:2upx 8upx;border-radius:10upx;white-space:nowrap;">新功能</text>
|
|
|
+ </view>
|
|
|
+ <button v-else class="admin-button-com middle" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(2)">跑腿</button>
|
|
|
+ </template>
|
|
|
<button class="admin-button-com middle" :class="[form.sendType == 4 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(4)" v-if="ghsInfo.shopId != 14248">快递</button>
|
|
|
<button class="admin-button-com middle" :class="[form.sendType == 3 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:60upx;" @click="changeSendType(3)" v-if="ghsInfo.shopId != 14248">物流</button>
|
|
|
</tui-list-cell>
|
|
|
@@ -170,7 +176,8 @@
|
|
|
<text style="color: #3385FF;width:100%;">到店自取，没有配送费</text>
|
|
|
</view>
|
|
|
<view v-if="form.sendType == 2">
|
|
|
- <text style="color: #3385FF;width:100%;">运费自理或到付（请联系客服）</text>
|
|
|
+ <text style="color: #3385FF;width:100%;" v-if="ghsInfo.openIntraCity == 1">有跑腿费</text>
|
|
|
+ <text style="color: #3385FF;width:100%;" v-else>运费自理或到付（请联系客服）</text>
|
|
|
</view>
|
|
|
<view v-if="form.sendType == 3">
|
|
|
<text style="color: #3385FF;width:100%;">运费到付</text>
|
|
|
@@ -392,7 +399,7 @@ export default {
|
|
|
return false
|
|
|
},
|
|
|
displaySendCost(){
|
|
|
- if(this.form.sendType == 2){
|
|
|
+ if(this.form.sendType == 2 && this.ghsInfo.openIntraCity==0){
|
|
|
return false
|
|
|
}
|
|
|
if(this.ghsInfo.pfLevel && this.ghsInfo.pfLevel == 1){
|
