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

ghsApp/src/admin/home/workbench.vue

@@ -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"
 				}
 			],
 			// 总览

ghsApp/src/api/arrears/index.js

@@ -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);
 };

ghsApp/src/pagesArrears/details.vue

@@ -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() {
 		}

ghsApp/src/pagesArrears/detailsItem.vue

@@ -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>

ghsApp/src/pagesPurchase/suppAdd.vue

@@ -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"
             />
@@ -134,7 +134,6 @@ export default {
   padding-left: 30px;
   margin-bottom: 30px;
 }
-// ---
 .module-com {
   margin-bottom: 20px;
   .member-wrap {

hdApp/src/admin/recharge/renew.vue

@@ -31,6 +31,7 @@
 
 <script>
 import { rechargeRenew, rechargeRenewPay } from '@/api/recharge'
+import { getList } from '@/api/ghs'
 import wexinPay from "@/utils/pay/wxPay";
 export default {
   name: 'recharge-renew',
@@ -45,6 +46,7 @@ export default {
   methods: {
     init () {
       this._getDet()
+      this._getGhsList()
     },
     _getDet () {
       rechargeRenew().then(res => {
@@ -52,6 +54,11 @@ export default {
         this.initData = res.data
       }).catch(err => { console.log(err) })
     },
+    _getGhsList() {
+      getList().then(res => {
+        console.log(res, 58)
+      }).catch(err => {})
+    },
     // 立即充值
     onceRecharge () {
       rechargeRenewPay().then(res => {

hdApp/src/pagesPurchase/gathering.vue

@@ -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">