|
|
@@ -179,6 +179,7 @@
|
|
|
<text style="color: #3385FF;width:100%;">运费到付</text>
|
|
|
</view>
|
|
|
</tui-list-cell>
|
|
|
+
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="needAddPackCost == true">
|
|
|
<view>
|
|
|
<text style="color: red;width:100%;">
|
|
|
@@ -186,6 +187,7 @@
|
|
|
</text>
|
|
|
</view>
|
|
|
</tui-list-cell>
|
|
|
+
|
|
|
<block v-if="$util.isEmpty(wlList)">
|
|
|
<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 3">
|
|
|
<view class="tui-title">配送物流</view>
|
|
|
@@ -203,11 +205,11 @@
|
|
|
</block>
|
|
|
</block>
|
|
|
|
|
|
-
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="displayAddress == true" @click="modifyAddress">
|
|
|
<view class="tui-title">收花地址</view>
|
|
|
<view v-if="!$util.isEmpty(shopInfo.lat) && !$util.isEmpty(shopInfo.long)">
|
|
|
- <view style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:420upx;"><text>{{shopInfo.fullAddress}}</text></view>
|
|
|
+ <view style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:420upx;"><text>{{shopInfo.address}}</text></view>
|
|
|
+ <view v-if="shopInfo.showAddress!=shopInfo.fullAddress" style="color:#848181;"><text>{{shopInfo.showAddress}}</text></view>
|
|
|
</view>
|
|
|
<view v-else>
|
|
|
<view><text style="color:#CCCCCC;">请完善门店地址</text></view>
|
|
|
@@ -381,7 +383,7 @@ export default {
|
|
|
computed: {
|
|
|
...mapGetters(["getMerchantInfo", "getLoginInfo","getDictionariesInfo"]),
|
|
|
displayAddress(){
|
|
|
- if(this.form.sendType == 2){
|
|
|
+ if(this.form.sendType != 1){
|
|
|
return true
|
|
|
}
|
|
|
if(this.ghsInfo.pfLevel && this.ghsInfo.pfLevel == 1){
|
