供货商-确认开单-总价自取去除运费

ghsApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/admin/home/components/module/operate.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/app-date-picker.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/app-result.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/kd_entrance.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/kd_entrance"],{3467:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{constant:this.$constant}}};t.default=u},45785:function(n,t,e){"use strict";e.r(t);var u=e("d044a"),a=e("dbe2");for(var r in a)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(r);e("8858");var c,f=e("41a2"),o=Object(f["a"])(a["default"],u["b"],u["c"],!1,null,"939fcdd2",null,!1,u["a"],c);t["default"]=o.exports},8858:function(n,t,e){"use strict";var u=e("ef52"),a=e.n(u);a.a},d044a:function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return a})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return u}));var a=function(){var n=this,t=n.$createElement;n._self._c},r=[]},dbe2:function(n,t,e){"use strict";e.r(t);var u=e("3467"),a=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=a.a},ef52:function(n,t,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/kd_entrance"],{"17a8":function(n,t,e){"use strict";var a;e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return a}));var u=function(){var n=this,t=n.$createElement;n._self._c},r=[]},3467:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={data:function(){return{constant:this.$constant}}};t.default=a},4086:function(n,t,e){"use strict";var a=e("aa43"),u=e.n(a);u.a},45785:function(n,t,e){"use strict";e.r(t);var a=e("17a8"),u=e("dbe2");for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);e("4086");var c,f=e("41a2"),o=Object(f["a"])(u["default"],a["b"],a["c"],!1,null,"dfa7e454",null,!1,a["a"],c);t["default"]=o.exports},aa43:function(n,t,e){},dbe2:function(n,t,e){"use strict";e.r(t);var a=e("3467"),u=e.n(a);for(var r in a)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(r);t["default"]=u.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/kd_entrance-create-component',
     {

ghsApp/dist/build/mp-weixin/components/kd_entrance.wxml

@@ -1 +1 @@
-<image class="icon_kd data-v-939fcdd2" src="{{constant.imgUrl+'/ghs/home/icon_kd.png'}}" data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/billing/index']]]]]]]}}" bindtap="__e"></image>
+<image class="icon_kd data-v-dfa7e454" src="{{constant.imgUrl+'/ghs/home/icon_kd.png'}}" data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/billing/index']]]]]]]}}" bindtap="__e"></image>

ghsApp/dist/build/mp-weixin/components/kd_entrance.wxss

@@ -1 +1 @@
-.icon_kd.data-v-939fcdd2{position:fixed;z-index:9999;bottom:100rpx;right:50rpx;width:100rpx;height:100rpx;box-sizing:border-box;border-radius:50%;overflow:hidden}
+.icon_kd.data-v-dfa7e454{position:fixed;z-index:9999;bottom:110rpx;right:50rpx;width:100rpx;height:100rpx;box-sizing:border-box;border-radius:50%;overflow:hidden}

ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/app-avatar.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/module/app-vip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/components/plugin/alert.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/components/plugin/fab.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

ghsApp/src/admin/billing/affirm.vue

@@ -81,7 +81,9 @@
 			<view class="price-view">
 				<text class="price-title">{{ form.debt==1?'欠款':'已收款' }}</text>
 				<text class="price-number">
-					¥ <text class="large">{{ allPrice+Number(form.sendCost)  }}</text>
+					¥
+					<text class="large" v-if="form.sendType==1">{{ allPrice+Number(form.sendCost)}}</text>
+					<text class="large" v-else>{{ allPrice}}</text>
 				</text>
 			</view>
 			<button class="admin-button-com blue middle" @click="affirmFormSubmit">开单</button>