新增同城配送

ghsApp/src/admin/billing/affirm.vue

@@ -108,9 +108,10 @@
 <block v-if="currentShop.pfLevel && currentShop.pfLevel == 1">
   <tui-list-cell class="line-cell" :hover="false" :arrow="false">
     <view class="tui-title">配送方式</view>
-    <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setTransType(0)" class="admin-button-com mini-btn" :class="form.transType == 0 ? 'blue' : 'default'">德帮</button>
-    <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setTransType(1)" class="admin-button-com mini-btn" :class="form.transType == 1 ? 'blue' : 'default'">顺丰</button>
-    <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="setTransType(2)" class="admin-button-com mini-btn" :class="form.transType == 2 ? 'blue' : 'default'">冷链</button>
+    <button style="margin-right:12upx;height:70upx;line-height:46upx;" @click="setTransType(4)" class="admin-button-com mini-btn" :class="form.transType == 4 ? 'blue' : 'default'">同城</button>
+    <button style="margin-right:12upx;height:70upx;line-height:46upx;" @tap="setTransType(0)" class="admin-button-com mini-btn" :class="form.transType == 0 ? 'blue' : 'default'">德邦</button>
+    <button style="margin-right:12upx;height:70upx;line-height:46upx;" @tap="setTransType(1)" class="admin-button-com mini-btn" :class="form.transType == 1 ? 'blue' : 'default'">顺丰</button>
+    <button style="margin-right:12upx;height:70upx;line-height:46upx;" @click="setTransType(2)" class="admin-button-com mini-btn" :class="form.transType == 2 ? 'blue' : 'default'">冷链</button>
     <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="setTransType(3)" class="admin-button-com mini-btn" :class="form.transType == 3 ? 'blue' : 'default'">航空</button>
   </tui-list-cell>
 </block>
@@ -321,7 +322,7 @@ export default {
 
     //默认送货
     this.setSendType(0)
-    this.setTransType(0)
+    this.setTransType(4)
 
     if(Number(option.customId) > 0){
       this.form.customId = option.customId

ghsApp/src/admin/shop/changeShop.vue

@@ -64,7 +64,7 @@ export default {
 			})
 		},
 		init(){
-			getPtGhsShop({hasSale:1}).then(res=>{
+			getPtGhsShop({hasSale:1,pageSize:100}).then(res=>{
 				this.shopData = res.data
 			})
 		},

ghsApp/src/pagesOrder/detail.vue

@@ -80,7 +80,7 @@
 	<view class="order-info_box">
 					<view>运输方式：</view>
 					<view>
-{{ detailInfo.transType==0?'德邦空运':detailInfo.transType==1?'顺丰空运':detailInfo.transType==2?'冷链物流':detailInfo.transType==3?'航空物流':'' }} <text style="font-weight:bold;margin-left:20upx;" v-if="detailInfo.transPayType == 1">到付</text>
+{{ detailInfo.transType==0?'德邦空运':detailInfo.transType==1?'顺丰空运':detailInfo.transType==2?'冷链物流':detailInfo.transType==3?'航空物流':detailInfo.transType==4?'同城配送':'' }} <text style="font-weight:bold;margin-left:20upx;" v-if="detailInfo.transPayType == 1">到付</text>
 					</view>
 				</view>
 </block>

hdApp/src/admin/billing/affirmGhs.vue

@@ -60,9 +60,10 @@
 
 <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: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 == 4 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:12upx;"  @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:12upx;"  @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:12upx;"  @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:12upx;" @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>
 
@@ -260,7 +261,7 @@ export default {
 				receiveLong: "",
 				receiveLat: "",
 				sendType: 0,
-				transType:0,
+				transType:4,
 				sendSide: "2",
 				sendDate: "",
 				sendTimeWant: "",
@@ -296,7 +297,7 @@ export default {
 	},
 	onLoad() {
 		this.getGhsData(this.option.id)
-		this.changeTransType(0)
+		this.changeTransType(4)
 	},
 	onShow() {
 		if(this.selectedHb.hbId && this.selectedHb.hbId > 0) {

hdApp/src/admin/billing/affirmGhsBook.vue

@@ -51,9 +51,10 @@
 
 <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: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 == 4 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:12upx;"  @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:12upx;"  @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:12upx;"  @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:12upx;" @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>
 	<tui-list-cell class="line-cell" :hover="false" :arrow="false">
@@ -250,7 +251,7 @@ export default {
 	},
 	onLoad(e) {
 		this.getGhsData(e.id);
-		this.changeTransType(0)
+		this.changeTransType(4)
 	},
 	onShow() {
 		if(this.form.sendType == 2){

hdApp/src/pagesPurchase/purDetails.vue

@@ -82,7 +82,7 @@
         <view class="order-info_box">
           <view>运输方式：</view>
           <view>
-{{ detailInfo.transType==0?'德邦空运':detailInfo.transType==1?'顺丰空运':detailInfo.transType==2?'冷链物流':detailInfo.transType==3?'航空物流':'' }} <text v-if="detailInfo.transPayType == 1" style="font-weight:bold;margin-left:10upx;">到付</text>
+{{ detailInfo.transType==0?'德邦空运':detailInfo.transType==1?'顺丰空运':detailInfo.transType==2?'冷链物流':detailInfo.transType==3?'航空物流':detailInfo.transType==4?'同城配送':'' }} <text v-if="detailInfo.transPayType == 1" style="font-weight:bold;margin-left:10upx;">到付</text>
           </view>
         </view>
 </block>