Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
zhh
/
front-end
1
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

Merge branch 'master' of http://git.huaml.com/zhh/front-end

wangning 5 lat temu
rodzic
e28382bf94 6af48e9b28
commit
609fc513fb
39 zmienionych plików z 211 dodań i 62 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 0 0
      ghs/dist/shop/css/chunk-2dced3fe.1a68b527.css
  2. 0 0
      ghs/dist/shop/css/chunk-2f9d4485.8545123b.css
  3. 0 0
      ghs/dist/shop/css/chunk-6c37a202.c87a7150.css
  4. 0 0
      ghs/dist/shop/css/chunk-76e270a4.59891e03.css
  5. 0 0
      ghs/dist/shop/css/chunk-7872ae4c.7217a1e5.css
  6. 0 0
      ghs/dist/shop/css/chunk-9cadfcfa.3b8c316f.css
  7. 0 0
      ghs/dist/shop/css/chunk-ed2df332.546de35b.css
  8. 1 1
      ghs/dist/shop/index.html
  9. 0 0
      ghs/dist/shop/js/app.0309308c.js
  10. 0 0
      ghs/dist/shop/js/chunk-03770f80.0a86ae4c.js
  11. 0 0
      ghs/dist/shop/js/chunk-0e0264d3.5e22a950.js
  12. 0 0
      ghs/dist/shop/js/chunk-290a2202.e06d0a7d.js
  13. 0 0
      ghs/dist/shop/js/chunk-2dced3fe.b22c5a01.js
  14. 0 0
      ghs/dist/shop/js/chunk-2f9d4485.40c795fd.js
  15. 1 0
      ghs/dist/shop/js/chunk-6c37a202.70dedc2d.js
  16. 0 0
      ghs/dist/shop/js/chunk-76e270a4.125e0aed.js
  17. 0 0
      ghs/dist/shop/js/chunk-7872ae4c.ec40a290.js
  18. 0 0
      ghs/dist/shop/js/chunk-9cadfcfa.8cc0d35d.js
  19. 0 1
      ghs/dist/shop/js/chunk-ed2df332.dbfa0f92.js
  20. 2 2
      ghsApp/src/admin/billing/affirm.vue
  21. 10 10
      ghsApp/src/admin/home/workbench.vue
  22. 3 7
      ghsApp/src/api/arrears/index.js
  23. 16 10
      ghsApp/src/components/app-supplier-sel.vue
  24. 11 12
      ghsApp/src/pagesArrears/details.vue
  25. 2 2
      ghsApp/src/pagesArrears/detailsItem.vue
  26. 8 0
      ghsApp/src/pagesPurchase/details.vue
  27. 5 5
      ghsApp/src/pagesPurchase/suppAdd.vue
  28. 3 0
      ghsApp/src/pagesPurchase/supplier.vue
  29. 0 0
      hd/dist/shop/css/chunk-681a982c.3610cfcd.css
  30. 0 0
      hd/dist/shop/css/chunk-81c3c45a.e2da405a.css
  31. 1 1
      hd/dist/shop/index.html
  32. 0 0
      hd/dist/shop/js/app.a4878ddf.js
  33. 0 0
      hd/dist/shop/js/chunk-1dd56396.a25e62c1.js
  34. 0 0
      hd/dist/shop/js/chunk-431fff1d.af992b93.js
  35. 0 0
      hd/dist/shop/js/chunk-681a982c.1e4d0507.js
  36. 0 0
      hd/dist/shop/js/chunk-81c3c45a.92f00c76.js
  37. 74 4
      hdApp/src/admin/billing/affirm.vue
  38. 73 6
      hdApp/src/admin/billing/affirmGoods.vue
  39. 1 1
      hdApp/src/pagesPurchase/gathering.vue

Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-2dced3fe.1a68b527.css


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-2f9d4485.8545123b.css


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-6c37a202.c87a7150.css


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-76e270a4.59891e03.css


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-7872ae4c.7217a1e5.css


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-9cadfcfa.3b8c316f.css


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-ed2df332.546de35b.css


+ 1 - 1
ghs/dist/shop/index.html
Wyświetl plik 

@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.85377d97.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.85377d97.js"></script></body></html>
 
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.0309308c.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.0309308c.js"></script></body></html>

Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/app.0309308c.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-03770f80.0a86ae4c.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-0e0264d3.5e22a950.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-290a2202.e06d0a7d.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-2dced3fe.b22c5a01.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-2f9d4485.40c795fd.js


+ 1 - 0
ghs/dist/shop/js/chunk-6c37a202.70dedc2d.js
Wyświetl plik 

@@ -0,0 +1 @@
 
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6c37a202","chunk-2d22891e"],{"25bd":function(e,i,n){},"572d":function(e,i,n){"use strict";n.r(i);var A=function(){var e=this,i=e.$createElement,n=e._self._c||i;return n("div",{staticClass:"card-name-module"},[n("div",{staticClass:"app-size-30 app-color-0"},[e._v(e._s(e.info.receiveUserName))]),n("div",[e._v(e._s(e.info.receiveMobile))]),n("div",[e._v(e._s(e.info.receiveFullAddress)+"（"+e._s(e.info.showAddress)+"）")]),e._m(0)])},s=[function(){var e=this,i=e.$createElement,A=e._self._c||i;return A("div",{staticClass:"card-tag"},[A("img",{attrs:{src:n("da6a"),alt:""}})])}],a={name:"card-name-module",props:{info:{type:Object,default:function(){}}},data:function(){return{}}},t=a,c=(n("c240"),n("5d22")),d=Object(c["a"])(t,A,s,!1,null,"34d73edc",null);i["default"]=d.exports},c240:function(e,i,n){"use strict";n("25bd")},da6a:function(e,i){e.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGIAAABiBAMAAABZixs9AAAAKlBMVEVHcEz/KED/KEL/KUL/J0L/KEL//f3/5ef/o6r/ZnT/hI7/QVX/xcn/sbecenlCAAAABXRSTlMAIN+Qj+jKzykAAAJ1SURBVFjD7dbNbtNAEAfw6SvwDtx5BN4BVvgjvc464BxrF5qrEwm1RydVyzWRqNSjieCebVVxhYqivgvr9a5jh+KdubOnJNI/P8/sl+GZ+Pd4DU+Ng+cDkZdPRv4j/REUXGR2xEQCWYmvLGR2IuKsYiA1sUk4lRiiYFTiiJCMWCJWJRFxxFyWNCRUDTHHH/aXVx5khCtNnCvE0v30YhiJVXqZnSH+mo0FEQmVTILvExGQERFhIUYaoCN1oxZ6KW6oiJnuWaEp9Y6GmBWlZ+9nondJRUCaFZU3Exi+pyC3t6UI5Y2ZwKgtZQgJEfMM5W/zZTHeFH7k+gZlurKTg9mWNCeHb92ndUqbkzYRZ6RKOokoXY9JiE2Ep3kZ0pA6McpzxGndrhGhXYd63pc68WDapY78SDQxfarXSyzWsvJXEn82f14/zbxSxHbpAmoiwAtJbJcl9La6JLarJu7s1l2cUBBNRDhtdm5E2oxvdBWfEI9XvSN5sF2mCqmXft4NwXC7dBXn9xn6E227duePJ+GQ3Z71Jjqri5hwq8stKHsslQMJi9R3T9Ee4WbHwzCiL59lW/wmHXqqFpni1i2z5lABH4If2ttxIoYTFvnmAkuLgQ9x49RdcuBFxPTj1dW1wuNU+BJuTrAe8m409icscnH2+PhQii9bf2LvRaIgJHpvK0oQEj1EkhIdpDnyvIkOEiS0xA5prwegIuTE35cWUBF6Yu/SIiTaSyshJywSpeSEe5GQ9MTeCzeQEU6ijwAbATYCbATYCLARYCPARoCNABsBNgJsBNgIsBFgI8BGgI0AGwE2AmwE2AiwEWAjwEaAjQAbYScO/gANPL52EWXAdQAAAABJRU5ErkJggg=="}}]);

Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-76e270a4.125e0aed.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-7872ae4c.ec40a290.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-9cadfcfa.8cc0d35d.js


+ 0 - 1
ghs/dist/shop/js/chunk-ed2df332.dbfa0f92.js
Wyświetl plik 

@@ -1 +0,0 @@
 
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-ed2df332","chunk-2d22891e"],{"3d0b":function(e,i,n){"use strict";n("9f72")},"572d":function(e,i,n){"use strict";n.r(i);var A=function(){var e=this,i=e.$createElement,n=e._self._c||i;return n("div",{staticClass:"card-name-module"},[n("div",{staticClass:"app-size-30 app-color-0"},[e._v(e._s(e.info.receiveUserName))]),n("div",[e._v(e._s(e.info.receiveMobile))]),n("div",[e._v(e._s(e.info.receiveAddress)+e._s(e.info.receiveFloor)+"（"+e._s(e.info.receiveFullAddress)+"）")]),e._m(0)])},s=[function(){var e=this,i=e.$createElement,A=e._self._c||i;return A("div",{staticClass:"card-tag"},[A("img",{attrs:{src:n("da6a"),alt:""}})])}],t={name:"card-name-module",props:{info:{type:Object,default:function(){}}},data:function(){return{}}},a=t,d=(n("3d0b"),n("5d22")),c=Object(d["a"])(a,A,s,!1,null,"74d2ddbb",null);i["default"]=c.exports},"9f72":function(e,i,n){},da6a:function(e,i){e.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGIAAABiBAMAAABZixs9AAAAKlBMVEVHcEz/KED/KEL/KUL/J0L/KEL//f3/5ef/o6r/ZnT/hI7/QVX/xcn/sbecenlCAAAABXRSTlMAIN+Qj+jKzykAAAJ1SURBVFjD7dbNbtNAEAfw6SvwDtx5BN4BVvgjvc464BxrF5qrEwm1RydVyzWRqNSjieCebVVxhYqivgvr9a5jh+KdubOnJNI/P8/sl+GZ+Pd4DU+Ng+cDkZdPRv4j/REUXGR2xEQCWYmvLGR2IuKsYiA1sUk4lRiiYFTiiJCMWCJWJRFxxFyWNCRUDTHHH/aXVx5khCtNnCvE0v30YhiJVXqZnSH+mo0FEQmVTILvExGQERFhIUYaoCN1oxZ6KW6oiJnuWaEp9Y6GmBWlZ+9nondJRUCaFZU3Exi+pyC3t6UI5Y2ZwKgtZQgJEfMM5W/zZTHeFH7k+gZlurKTg9mWNCeHb92ndUqbkzYRZ6RKOokoXY9JiE2Ep3kZ0pA6McpzxGndrhGhXYd63pc68WDapY78SDQxfarXSyzWsvJXEn82f14/zbxSxHbpAmoiwAtJbJcl9La6JLarJu7s1l2cUBBNRDhtdm5E2oxvdBWfEI9XvSN5sF2mCqmXft4NwXC7dBXn9xn6E227duePJ+GQ3Z71Jjqri5hwq8stKHsslQMJi9R3T9Ee4WbHwzCiL59lW/wmHXqqFpni1i2z5lABH4If2ttxIoYTFvnmAkuLgQ9x49RdcuBFxPTj1dW1wuNU+BJuTrAe8m409icscnH2+PhQii9bf2LvRaIgJHpvK0oQEj1EkhIdpDnyvIkOEiS0xA5prwegIuTE35cWUBF6Yu/SIiTaSyshJywSpeSEe5GQ9MTeCzeQEU6ijwAbATYCbATYCLARYCPARoCNABsBNgJsBNgIsBFgI8BGgI0AGwE2AmwE2AiwEWAjwEaAjQAbYScO/gANPL52EWXAdQAAAABJRU5ErkJggg=="}}]);

+ 2 - 2
ghsApp/src/admin/billing/affirm.vue
Wyświetl plik 

@@ -97,7 +97,7 @@
 
 
 									<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 
 										<view class="tui-title">实收金额</view>
 
-										<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);" type="number" v-model="realMoney" placeholder-class="tui-placeholder"/>
 
+										<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);" type="number" @focus="realMoney=''" v-model="realMoney" placeholder-class="tui-placeholder"/>
 
 									</tui-list-cell>
 
 
 									<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 
@@ -123,7 +123,7 @@
 
       </button>
 
     </view>
 
     <!-- 选择客户 -->
 
-    <AppCustomerSel :isNewClient.sync="isNewClient" :show.sync="showCustomer" @change="changeCustomerFn"/>
 
+    <AppCustomerSel :show.sync="showCustomer" @change="changeCustomerFn"/>
 
   </view>
 
 </template>

+ 10 - 10
ghsApp/src/admin/home/workbench.vue
Wyświetl plik 

@@ -200,6 +200,11 @@ export default {
 
 					img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`,
 
 					url: "/pagesPurchase/order"
 
 				},
 
+				{
 
+					name: "供应商",
 
+					img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`,
 
+					url: "/pagesPurchase/supplier"
 
+				},
 
 				{
 
 					name: "库存",
 
 					img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,
 
@@ -215,16 +220,16 @@ export default {
 
 					img: `${this.$constant.imgUrl}/ghs/home/dbrk.png`,
 
 					url: "/pagesStorehouse/allot/allotPut"
 
 				},
 
-				{
 
-					name: "花材",
 
-					img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,
 
-					url: "/pagesStorehouse/flower/manage"
 
-				},
 
 				{
 
 					name: "客户欠款",
 
 					img: `${this.$constant.imgUrl}/ghs/home/khqk.png`,
 
 					url: "/pagesArrears/list"
 
 				},
 
+				{
 
+					name: "盘点",
 
+					img: `${this.$constant.imgUrl}/ghs/home/pandian.png`,
 
+					url: "/pagesStorehouse/inventory/list"
 
+				},
 
 				{
 
 					name: "员工",
 
 					img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,
 
@@ -239,11 +244,6 @@ export default {
 
 					name: "经营概况",
 
 					img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,
 
 					url: "/pagesStatistics/business"
 
-				},
 
-				{
 
-					name: "供货商",
 
-					img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`,
 
-					url: "/pagesPurchase/supplier"
 
 				}
 
 			],
 
 			// 总览

+ 3 - 7
ghsApp/src/api/arrears/index.js
Wyświetl plik 

@@ -1,19 +1,15 @@
 
 import https from "@/plugins/luch-request_0.0.7/request";
 
 
-/**
 
- * 客户欠款列表查询
 
- * @param {*} name
 
- */
 
 export const getDebtListApi = name => {
 
 	return https.get("/custom/debt-list", { name });
 
 };
 
 
 /**
 
- * 客户欠款详情查询
 
+ * 供应商欠款详情查询
 
  * @param {*} name
 
  */
 
 export const getOrderDebtListApi = id => {
 
-	return https.get("/order/debt-list", { id });
 
+	return https.get("/purchase/debt-list", { id });
 
 };
 
 
 /**
 
@@ -21,5 +17,5 @@ export const getOrderDebtListApi = id => {
 
  * @param {*} id
 
  */
 
 export const clearOrderApi = id => {
 
-	return https.post("/order-clear/clear", id);
 
+	return https.post("/purchase-clear/create-order", id);
 
 };

+ 16 - 10
ghsApp/src/components/app-supplier-sel.vue
Wyświetl plik 

@@ -3,7 +3,7 @@
 
 		<bottom-popup class="popup-wrap" :show="showPopup" @close="hidePopup">
 
 			<div class="map-wrap">
 
 				<div class="map-top-tit-wrap">
 
-					<div class="map-top-tit">请选择客户</div>
 
+					<div class="map-top-tit">请选择供货商</div>
 
 					<app-close icon="iconguanbi" @close="hidePopup" />
 
 				</div>
 
 				<!-- 搜索 -->
 
@@ -37,14 +37,14 @@
 
 						<view class="item-avatar">
 
 							<image :src="item.smallAvatar" alt="商品图" />
 
 						</view>
 
-						<view class="item-name"> {{ item.name || "" }}</view>
 
+						<view class="item-name"> {{ item.name || "" }} <text v-if="newGhsId==item.id">新供货商</text></view>
 
 						<view class="item-level">{{ getCustomerLevelName(item) }}</view>
 
 						<!-- <view class="item-tag">NEW</view> -->
 
 					</view>
 
 				</scroll-view>
 
-<!--				<view class="add-customer-bar" @click="gotoAddCustomer">-->
 
-<!--					没有找到客户？新增-->
 
-<!--				</view>-->
 
+				<view class="add-customer-bar" @click="gotoAddCustomer">
 
+					没有找到供货商？新增
 
+				</view>
 
 			</div>
 
 		</bottom-popup>
 
 	</div>
 
@@ -75,6 +75,7 @@ export default {
 
 		return {
 
 			showPopup: false,
 
 			name: "",
 
+			newGhsId: "",
 
 			customerListData: []
 
 		};
 
 	},
 
@@ -107,9 +108,8 @@ export default {
 
 		initList() {
 
 			return getList({ type: "0", name: this.name })
 
 				.then(res => {
 
-					const {
 
-						data: { list }
 
-					} = res;
 
+					const {data: { list }} = res;
 
+					this.newGhsId = uni.getStorageSync("newGhs")?uni.getStorageSync("newGhs").id:'';
 
 					this.customerListData = list;
 
 				})
 
 				.catch(err => {});
 
@@ -148,7 +148,7 @@ export default {
 
 		},
 
 		gotoAddCustomer() {
 
 			uni.navigateTo({
 
-				url: "/pagesClient/member/add",
 
+				url: "/pagesPurchase/suppAdd",
 
 				success: result => {
 
 					this.hidePopup();
 
 				},
 
@@ -218,7 +218,13 @@ export default {
 
 			.item-name {
 
 				flex-shrink: 0;
 
 				margin: 0 20upx;
 
-				width: 200upx;
 
+				/*width: 200upx;*/
 
+				text{
 
+					padding: 0 10rpx;
 
+					margin-left: 20rpx;
 
+					color: #3385ff;
 
+					border: 1px solid #3385ff;
 
+				}
 
 			}
 
 			.item-level {
 
 				margin: 0 20upx;

+ 11 - 12
ghsApp/src/pagesArrears/details.vue
Wyświetl plik 

@@ -2,18 +2,18 @@
 
 	<view class="order-page">
 
 		<view class="top-view">
 
 			<view class="top-row">
 
-				<text class="header-item"> 客户</text>
 
+				<text class="header-item">供应商</text>
 
 				<text class="header-item">总欠款 </text>
 
 			</view>
 
 			<view class="top-row">
 
 				<view class="info-item">
 
-					<image class="logo" :src="customInfo.smallAvatar"/>
 
+					<image class="logo" :src="ghsInfo.smallAvatar"/>
 
 					<text class="name">
 
-						{{ customInfo.name || "" }}
 
+						{{ ghsInfo.name || "" }}
 
 					</text>
 
 				</view>
 
 				<view class="price-item">
 
-					{{ customInfo.debtAmount || "0.00" }}
 
+					{{ ghsInfo.debtAmount || "0.00" }}
 
 				</view>
 
 			</view>
 
 		</view>
 
@@ -54,7 +54,7 @@
 
 				</view>
 
 			</template>
 
 			<view class="btn-view">
 
-				<button :class="['admin-button-com', 'blue']" @click="batchEvent" >收款</button>
 
+				<button :class="['admin-button-com', 'blue']" @click="batchEvent" >结算</button>
 
 			</view>
 
 		</view>
 
 	</view>
 
@@ -63,13 +63,12 @@
 
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 
 import DetailsItem from "./detailsItem";
 
 import { getOrderDebtListApi,clearOrderApi } from "@/api/arrears/index";
 
-import wexinPay from "@/utils/pay/wxPay";
 
 
 export default {
 
 	components: { AppWrapperEmpty, DetailsItem },
 
 	data() {
 
 		return {
 
-			customInfo: "",
 
+			ghsInfo: "",
 
 			totalAmount: "",
 
 			num: "",
 
 			detailsList: [],
 
@@ -126,9 +125,9 @@ export default {
 
 			try {
 
 				this.listLoading = true;
 
 				const {
 
-					data: { customInfo, num, totalAmount, list }
 
+					data: { ghsInfo, num, totalAmount, list }
 
 				} = await getOrderDebtListApi(this.option.id);
 
-				this.customInfo = customInfo;
 
+				this.ghsInfo = ghsInfo;
 
 				this.totalAmount = totalAmount;
 
 				this.num = num;
 
 				this.detailsList = list.map(ele => {
 
@@ -180,12 +179,12 @@ export default {
 
 				});
 
 			let parameter = {
 
 					id:JSON.stringify(ids),
 
-				customId:this.customInfo.id,
 
+				ghsId:this.ghsInfo.id,
 
 			}
 
 			let self = this;
 
 				uni.showModal({
 
 					title: '提示',
 
-					content: '确定已收款？',
 
+					content: '确定已结算？',
 
 					success: function (res) {
 
 						if (res.confirm) {
 
 							self.paySuccess(parameter)
 
@@ -197,7 +196,7 @@ export default {
 
 		// 支付成功
 
 		async paySuccess(parameter) {
 
 			await clearOrderApi(parameter);
 
-			this.pageTo({url:'/common/pageSuccess?title=收款成功', type: 2});
 
+			this.pageTo({url:'/common/pageSuccess?title=结算成功', type: 2});
 
 		},
 
 		payFail() {
 
 		}

+ 2 - 2
ghsApp/src/pagesArrears/detailsItem.vue
Wyświetl plik 

@@ -6,13 +6,13 @@
 
 		</view>
 
 		<view class="details-main">
 
 			<view class="item-header">
 
-				<text class="name">销售单 | {{info.orderSn}} </text>
 
+				<text class="name">采购单 | {{info.orderSn}} </text>
 
 			</view>
 
 			<view class="item-row">
 
 				<view class="mark">{{ info.addTime }}</view>
 
 			</view>
 
 			<view class="item-row">
 
-				<view class="mark">成交金额：{{ info.realPrice }}</view>
 
+				<view class="mark">金额：{{ info.realPrice }}</view>
 
 				<view class="price">{{ info.realPrice }}</view>
 
 			</view>
 
 		</view>

+ 8 - 0
ghsApp/src/pagesPurchase/details.vue
Wyświetl plik 

@@ -199,6 +199,14 @@ export default {
 
 	onLoad() {
 
 		this.initData();
 
 	},
 
+	onShow(){
 
+		if(!this.$util.isEmpty(uni.getStorageSync("newGhs"))){
 
+			this.showCustomer = true;
 
+		}
 
+	},
 
+	onUnload(){
 
+		uni.removeStorageSync('newGhs');
 
+	},
 
 	computed: {
 
 		...mapGetters(["getMerchantInfo", "getLoginInfo"]),
 
 		allPrice() {

+ 5 - 5
ghsApp/src/pagesPurchase/suppAdd.vue
Wyświetl plik 

@@ -4,11 +4,11 @@
 
         <!-- 花店名称 -->
 
         <div class="module-com input-line-wrap">
 
           <tui-list-cell class="line-cell" :hover="false">
 
-            <div class="tui-title required">花店名称</div>
 
+            <div class="tui-title required">名称</div>
 
             <input
 
               v-model="form.name"
 
               class="tui-input"
 
-              placeholder="请输入花店名称"
 
+              placeholder="请输入供应商名称"
 
               maxlength="50"
 
               type="text"
 
               name="username"
 
@@ -45,7 +45,7 @@
 
             <input
 
               v-model="form.address"
 
               class="tui-input"
 
-              placeholder="请输入地址"
 
+              placeholder="选填"
 
               maxlength="50"
 
               type="text"
 
             />
 
@@ -114,6 +114,7 @@ export default {
 
         title:"加载中..."
 
       })
 
       ghsAdd(this.form).then(res => {
 
+							uni.setStorageSync('newGhs', res.data);
 
         uni.hideLoading()
 
         setTimeout(() => {
 
           this.$util.pageTo(1);
 
@@ -134,7 +135,6 @@ export default {
 
   padding-left: 30px;
 
   margin-bottom: 30px;
 
 }
 
-// ---
 
 .module-com {
 
   margin-bottom: 20px;
 
   .member-wrap {
 
@@ -158,4 +158,4 @@ export default {
 
     width: 100%;
 
   }
 
 }
 
-</style>
 
+</style>

+ 3 - 0
ghsApp/src/pagesPurchase/supplier.vue
Wyświetl plik 

@@ -63,6 +63,9 @@ export default {
 
       tabIndex: 0
 
     }
 
   },
 
+	onShow(){
 
+		uni.removeStorageSync('newGhs');
 
+	},
 
   onPullDownRefresh() {
 
     this.getGHSList().then(res => {
 
       uni.stopPullDownRefresh();

Plik diff jest za duży
+ 0 - 0
hd/dist/shop/css/chunk-681a982c.3610cfcd.css


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/css/chunk-81c3c45a.e2da405a.css


+ 1 - 1
hd/dist/shop/index.html
Wyświetl plik 

@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.78757ae4.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.78757ae4.js"></script></body></html>
 
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.a4878ddf.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.a4878ddf.js"></script></body></html>

Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/app.a4878ddf.js


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/chunk-1dd56396.a25e62c1.js


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/chunk-431fff1d.af992b93.js


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/chunk-681a982c.1e4d0507.js


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/chunk-81c3c45a.92f00c76.js


+ 74 - 4
hdApp/src/admin/billing/affirm.vue
Wyświetl plik 

@@ -59,7 +59,7 @@
 
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 
 						<view class="tui-title ">包装费</view>
 
-						<input type="number" placeholder="请填写人工和材料费" v-model="packingMoney" placeholder-class="tui-placeholder">
 
+						<input type="number" placeholder="请填写人工和材料费" @input="countAllPrices()" v-model="packingMoney" placeholder-class="tui-placeholder">
 
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 
 						<view class="tui-title ">送货</view>
 
@@ -68,7 +68,7 @@
 
 					</tui-list-cell>
 
 					<tui-list-cell v-if="sendType == 0" class="line-cell" :hover="false" :arrow="false" >
 
 						<view class="tui-title ">运费</view>
 
-						<input type="number" placeholder="选填" v-model="freight" placeholder-class="tui-placeholder">
 
+						<input type="number" placeholder="选填" v-model="freight" @input="countAllPrices()" placeholder-class="tui-placeholder">
 
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 
 						<view class="tui-title ">结算方式</view>
 
@@ -78,6 +78,30 @@
 
 						</button>
 
 					</tui-list-cell>
 
 
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 
+						<view class="tui-title">总金额</view>
 
+						<text style="color: #3385FF" >{{	(allPrice+Number(packingMoney)+Number(freight)).toFixed(2)  }}</text>
 
+					</tui-list-cell>
 
+
 
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 
+						<view class="tui-title">实收金额</view>
 
+						<view class="flex-space" style="width: 100%;">
 
+							<input style="border: 1px solid #eee;color: #3385FF;width: 60%;" type="number" @focus="realMoney='',discountIndex=0" v-model="realMoney" placeholder-class="tui-placeholder"/>
 
+							<picker style="border: 1px solid #eee;width: 30%;" @change="discountChange" :value="discountIndex" :range="discount">
 
+								<view class="flex-space">
 
+									<view class="uni-input">{{discount[discountIndex]}}</view>
 
+									<i class="iconfont iconxiangyou"></i>
 
+								</view>
 
+							</picker>
 
+						</view>
 
+						<!--<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);" type="number" @focus="realMoney=''" v-model="realMoney" placeholder-class="tui-placeholder"/>-->
 
+					</tui-list-cell>
 
+
 
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 
+						<view class="tui-title">优惠</view>
 
+						<text style="color: #3385FF">{{	((allPrice+Number(packingMoney)+Number(freight)).toFixed(2) - realMoney).toFixed(2) }}</text>
 
+					</tui-list-cell>
 
+
 
 
 <!--					<appFormSend :form.sync="form"> </appFormSend>-->
 
 				</view>
 
@@ -87,7 +111,8 @@
 
 			<view class="price-view">
 
 				<text class="price-title">收款</text>
 
 				<text class="price-number">
 
-					¥ <text class="large">{{ allPrice+Number(packingMoney)+Number(freight)  }}</text>
 
+					<!--¥ <text class="large">{{	(allPrice+Number(packingMoney)+Number(freight)).toFixed(2)  }}</text>-->
 
+					¥ <text class="large">{{	realMoney }}</text>
 
 				</text>
 
 			</view>
 
 			<button class="admin-button-com blue middle" @click="affirmFormSubmit">开单</button>
 
@@ -132,10 +157,13 @@ export default {
 
 			autoLoad: false,
 
 			packingMoney:'',//包装费
 
 			freight:'',//运费
 
+			realMoney:0,//真实金额
 
 			payType:1,//选中的-支付类型
 
 			clientInfo: '',//客户信息
 
 			showCustomer: false,
 
-			sendType:1
 
+			sendType:1,
 
+			discountIndex:0,
 
+			discount:['未打折','95折','9折','85折','8折','75折','7折','65折','6折']
 
 		};
 
 	},
 
 	onLoad() {
 
@@ -150,12 +178,53 @@ export default {
 
 				title: this.getMerchantInfo.name
 
 			});
 
 		}
 
+		this.realMoney = this.allPrice.toFixed(2);
 
 	},
 
 	computed: {
 
 		...mapGetters(["getMerchantInfo", "getLoginInfo","getDictionariesInfo"])
 
 	},
 
 	methods: {
 
 		...mapActions(["initMerchantInfo"]),
 
+		discountChange(e){
 
+			this.discountIndex = e.target.value;
 
+			let discount = 0;
 
+			let Prices = this.allPrice.toFixed(2)
 
+			let allPrices = (Number(Prices) + Number(this.freight) + Number(this.packingMoney)).toFixed(2);
 
+			switch (e.target.value) {
 
+				case '0':
 
+					discount = 0
 
+					break;
 
+				case '1':
 
+					discount = (allPrices - (allPrices * 0.95)).toFixed(2);
 
+					break;
 
+				case '2':
 
+					discount = (allPrices - (allPrices * 0.9)).toFixed(2);
 
+					break;
 
+				case '3':
 
+					discount = (allPrices - (allPrices * 0.85)).toFixed(2);
 
+					break;
 
+				case '4':
 
+					discount = (allPrices - (allPrices * 0.8)).toFixed(2);
 
+					break;
 
+				case '5':
 
+					discount = (allPrices - (allPrices * 0.75)).toFixed(2);
 
+					break;
 
+				case '6':
 
+					discount = (allPrices - (allPrices * 0.7)).toFixed(2);
 
+					break;
 
+				case '7':
 
+					discount = (allPrices - (allPrices * 0.65)).toFixed(2);
 
+					break;
 
+				case '8':
 
+					discount = (allPrices - (allPrices * 0.6)).toFixed(2);
 
+					break;
 
+			}
 
+			this.realMoney = (allPrices - discount).toFixed(2);
 
+		},
 
+		countAllPrices(){
 
+			let allPrices = this.allPrice.toFixed(2)
 
+			this.realMoney = (Number(allPrices) + Number(this.freight) + Number(this.packingMoney)).toFixed(2);
 
+		},
 
 		// 选取客户
 
 		changeCustomerFn(info) {
 
 			console.log("changeCustomerFn", info);
 
@@ -176,6 +245,7 @@ export default {
 
 				customId:this.clientInfo.id,// 客户
 
 				payWay:this.payType,//付款方式
 
 				sendType:this.sendType,
 
+				realPrice: this.realMoney,
 
 				product:JSON.stringify(product),//下单商品
 
 			};
 
 			let self = this;

+ 73 - 6
hdApp/src/admin/billing/affirmGoods.vue
Wyświetl plik 

@@ -57,13 +57,13 @@
 
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 
 						<view class="tui-title ">送货</view>
 
-						<button @tap="sendType=1" class="admin-button-com mini-btn" :class="sendType==1?'blue':'default'">自取</button>
 
-						<button @tap="sendType=0" class="admin-button-com mini-btn" :class="sendType==0?'blue':'default'">配送</button>
 
+						<button @tap="sendType=1,freight=0,countAllPrices()" class="admin-button-com mini-btn" :class="sendType==1?'blue':'default'">自取</button>
 
+						<button @tap="sendType=0,freight=0" class="admin-button-com mini-btn" :class="sendType==0?'blue':'default'">配送</button>
 
 					</tui-list-cell>
 
 
 					<tui-list-cell v-if="sendType == 0" class="line-cell" :hover="false" :arrow="false" >
 
 						<view class="tui-title ">运费</view>
 
-						<input type="number" placeholder="留空免运费" v-model="freight" placeholder-class="tui-placeholder">
 
+						<input type="number" placeholder="留空免运费" v-model="freight" @input="countAllPrices()" placeholder-class="tui-placeholder">
 
 					</tui-list-cell>
 
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 
@@ -73,6 +73,28 @@
 
 							{{ res.name }}
 
 						</button>
 
 					</tui-list-cell>
 
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 
+						<view class="tui-title">总金额</view>
 
+						<text style="color: #3385FF" >{{	(Number(freight)+Number(allGoodsPrice)).toFixed(2)  }}</text>
 
+					</tui-list-cell>
 
+
 
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 
+						<view class="tui-title">实收金额</view>
 
+						<view class="flex-space" style="width: 100%;">
 
+							<input style="border: 1px solid #eee;color: #3385FF;width: 60%;" type="number" @focus="realMoney='',discountIndex=0" v-model="realMoney" placeholder-class="tui-placeholder"/>
 
+							<picker style="border: 1px solid #eee;width: 30%;" @change="discountChange" :value="discountIndex" :range="discount">
 
+								<view class="flex-space">
 
+									<view class="uni-input">{{discount[discountIndex]}}</view>
 
+									<i class="iconfont iconxiangyou"></i>
 
+								</view>
 
+							</picker>
 
+						</view>
 
+					</tui-list-cell>
 
+
 
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 
+						<view class="tui-title">优惠</view>
 
+						<text style="color: #3385FF">{{	((Number(freight)+Number(allGoodsPrice)).toFixed(2) - realMoney).toFixed(2) }}</text>
 
+					</tui-list-cell>
 
 
 
 <!--					<appFormSend :form.sync="form"> </appFormSend>-->
 
@@ -83,7 +105,7 @@
 
 			<view class="price-view">
 
 				<text class="price-title">收款</text>
 
 				<text class="price-number">
 
-					¥ <text class="large">{{ Number(freight)+Number(allGoodsPrice)  }}</text>
 
+					¥ <text class="large">{{	realMoney  }}</text>
 
 				</text>
 
 			</view>
 
 			<button class="admin-button-com blue middle" @click="affirmFormSubmit">开单</button>
 
@@ -109,7 +131,7 @@ const formUtil = require("@/utils/formValidation.js");
 
 import { createOrder,freight } from "@/api/order/index";
 
 // import { freight } from "@/api/order";
 
 import { mapActions, mapGetters } from "vuex";
 
-
 
+import { copyObject } from "@/utils/util";
 
 export default {
 
 	name: "BillingAffirm", // 开单确认
 
 	components: {
 
@@ -132,7 +154,10 @@ export default {
 
 			payType:1,//选中的-支付类型
 
 			clientInfo: '',//客户信息
 
 			showCustomer: false,
 
-			sendType:1
 
+			realMoney: 0,
 
+			sendType:1,
 
+			discountIndex:0,
 
+			discount:['未打折','95折','9折','85折','8折','75折','7折','65折','6折']
 
 		};
 
 	},
 
 	onLoad() {
 
@@ -147,6 +172,7 @@ export default {
 
 				title: this.getMerchantInfo.name
 
 			});
 
 		}
 
+		this.realMoney = this.allGoodsPrice.toFixed(2);
 
 		setTimeout(()=>{
 
 			this.payType = this.getDictionariesInfo.htPayWayOption[0].id;
 
 		},100)
 
@@ -156,6 +182,46 @@ export default {
 
 	},
 
 	methods: {
 
 		...mapActions(["initMerchantInfo"]),
 
+		discountChange(e){
 
+			this.discountIndex = e.target.value;
 
+			let discount = 0;
 
+			let allGoodsPrice = this.allGoodsPrice.toFixed(2)
 
+			let allPrices = (Number(allGoodsPrice) + Number(this.freight)).toFixed(2);
 
+			switch (e.target.value) {
 
+				case '0':
 
+					discount = 0
 
+				break;
 
+				case '1':
 
+					discount = (allPrices - (allPrices * 0.95)).toFixed(2);
 
+					break;
 
+				case '2':
 
+					discount = (allPrices - (allPrices * 0.9)).toFixed(2);
 
+					break;
 
+				case '3':
 
+					discount = (allPrices - (allPrices * 0.85)).toFixed(2);
 
+					break;
 
+				case '4':
 
+					discount = (allPrices - (allPrices * 0.8)).toFixed(2);
 
+					break;
 
+				case '5':
 
+					discount = (allPrices - (allPrices * 0.75)).toFixed(2);
 
+					break;
 
+				case '6':
 
+					discount = (allPrices - (allPrices * 0.7)).toFixed(2);
 
+					break;
 
+				case '7':
 
+					discount = (allPrices - (allPrices * 0.65)).toFixed(2);
 
+					break;
 
+				case '8':
 
+					discount = (allPrices - (allPrices * 0.6)).toFixed(2);
 
+					break;
 
+			}
 
+			this.realMoney = (allPrices - discount).toFixed(2);
 
+		},
 
+		countAllPrices(){
 
+			let allPrices = this.allGoodsPrice.toFixed(2)
 
+			this.realMoney = (Number(allPrices) + Number(this.freight)).toFixed(2);
 
+		},
 
 		// 选取客户
 
 		changeCustomerFn(info) {
 
 			console.log("changeCustomerFn", info);
 
@@ -182,6 +248,7 @@ export default {
 
 				customId:this.clientInfo.id,// 客户
 
 				payWay:this.payType,//付款方式
 
 				sendType:this.sendType,//配送方式 0未知 1自取
 
+				realPrice: this.realMoney,
 
 				goodsInfo:JSON.stringify(product),//下单商品
 
 			};
 
 			let self = this;

+ 1 - 1
hdApp/src/pagesPurchase/gathering.vue
Wyświetl plik 

@@ -2,7 +2,7 @@
 
   <view class="order-page">
 
     <view class="top-view">
 
       <view class="top-row">
 
-        <text class="header-item"> 客户</text>
 
+        <text class="header-item">供货商</text>
 
         <text class="header-item">总欠款 </text>
 
       </view>
 
       <view class="top-row">

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików