下单优化

hdApp/src/admin/billing/affirmGhs.vue

@@ -78,6 +78,15 @@
 		<button class="admin-button-com middle" :class="[form.transType == 5 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;font-size:23upx;"  @click="changeTransType(5)">到店自取</button>
 	</tui-list-cell>
 
+	<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-else-if="ghsInfo.shopId == 29136">
+		<button class="admin-button-com middle" :class="[form.transType == 0 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(0)">德邦物流</button>
+		<button class="admin-button-com middle" :class="[form.transType == 1 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(1)">顺丰物流</button>
+		<button class="admin-button-com middle" :class="[form.transType == 2 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;" @click="changeTransType(2)">冷链物流</button>
+		<button class="admin-button-com middle" :class="[form.transType == 3 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;" @click="changeTransType(3)">航空物流</button>
+		<button class="admin-button-com middle" :class="[form.transType == 4 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(4)">同城配送</button>
+		<button class="admin-button-com middle" :class="[form.transType == 5 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;font-size:23upx;"  @click="changeTransType(5)">到店自取</button>
+	</tui-list-cell>
+
 	<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-else>
 		<button class="admin-button-com middle" :class="[form.transType == 4 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(4)">同城配送</button>
 		<button class="admin-button-com middle" :class="[form.transType == 0 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(0)">德邦物流</button>
@@ -106,6 +115,7 @@
 			</view>
 			<view v-if="form.transType != 5">
 				<text v-if="ghsInfo.shopId == 13398" style="color:red;width:100%;font-weight:bold;">本店昆明直发包邮到店，购买数量需要15扎以上，低于15扎请联系当地店长！</text>
+				<text v-else-if="ghsInfo.shopId == 29136" style="color:red;width:100%;font-weight:bold;">运费、打包费请联系客服</text>
 				<text v-else style="color:#3385FF;width:100%;font-weight:bold;">运费预收，根据实际产生物流费用，多退少补。有退款会原路退回。</text>
 			</view>
 		</block>
@@ -191,8 +201,7 @@
 					<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><text>{{shopInfo.fullAddress}}</text></view>
-							<view><text>{{shopInfo.showAddress}}</text></view>
+							<view style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:420upx;"><text>{{shopInfo.fullAddress}}</text></view>
 						</view>
 						<view v-else>
 							<view><text style="color:#CCCCCC;">请完善门店地址</text></view>
@@ -677,6 +686,8 @@ export default {
 				}else if(res.data && res.data.shopId == 16781){
 					//云中花花卉默认德邦
 					this.changeTransType(0)
+				}else if(res.data && res.data.shopId == 29136){
+					this.changeTransType(0)
 				}else{
 					this.changeTransType(4)
 				}