新增到店自取

ghsApp/src/admin/billing/affirm.vue

@@ -108,11 +108,12 @@
 <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: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>
+    <button style="margin-right:9upx;height:86upx;line-height:30upx;font-size:23upx;" @click="setTransType(4)" class="admin-button-com mini-btn" :class="form.transType == 4 ? 'blue' : 'default'">同城</button>
+    <button style="margin-right:9upx;height:86upx;line-height:30upx;font-size:23upx;" @tap="setTransType(0)" class="admin-button-com mini-btn" :class="form.transType == 0 ? 'blue' : 'default'">德邦</button>
+    <button style="margin-right:9upx;height:86upx;line-height:30upx;font-size:23upx;" @tap="setTransType(1)" class="admin-button-com mini-btn" :class="form.transType == 1 ? 'blue' : 'default'">顺丰</button>
+    <button style="margin-right:9upx;height:86upx;line-height:30upx;font-size:23upx;" @click="setTransType(2)" class="admin-button-com mini-btn" :class="form.transType == 2 ? 'blue' : 'default'">冷链</button>
+    <button style="margin-right:9upx;height:86upx;line-height:30upx;font-size:23upx;" @click="setTransType(3)" class="admin-button-com mini-btn" :class="form.transType == 3 ? 'blue' : 'default'">航空</button>
+    <button style="margin-right:0upx;height:86upx;line-height:30upx;font-size:23upx;" @click="setTransType(5)" class="admin-button-com mini-btn" :class="form.transType == 5 ? 'blue' : 'default'">自取</button>
   </tui-list-cell>
 </block>
 <block v-else>

hdApp/src/admin/billing/affirmGhs.vue

@@ -60,11 +60,12 @@
 
 <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 == 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>
+		<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>
+		<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 == 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">
@@ -343,8 +344,8 @@ export default {
 			}
 			this.needAddPackCost = false
 			if(this.ghsInfo.pfLevel && this.ghsInfo.pfLevel == 1){
-				//不是同城配送的，算打包费
-				if(this.form.transType != 4){
+				//不是同城配送的，不是到店自取的，才算打包费
+				if(this.form.transType != 4 && this.form.transType != 5){
 					//昆明发全国
 					this.needAddPackCost = true
 					price = price + this.form.packCost

hdApp/src/admin/billing/affirmGhsBook.vue

@@ -51,11 +51,12 @@
 
 <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 == 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>
+		<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>
+		<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 == 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">
 	<view>
@@ -290,7 +291,7 @@ export default {
 			this.needAddPackCost = false
 			if(this.ghsInfo.pfLevel && this.ghsInfo.pfLevel == 1){
 				//不是同城配送的，算打包费
-				if(this.form.transType != 4){
+				if(this.form.transType != 4 && this.form.transType != 5){
 					//昆明发全国
 					this.needAddPackCost = true
 					price = price + this.form.packCost