shish 5 лет назад
Родитель
Сommit
512a45feb7

+ 4 - 4
ghsApp/src/admin/clear/info.vue

@@ -41,7 +41,7 @@
 							:key="idx"
 							class="commodity-item"
 						>
-							<view class="item-info" @click="pageTo({url: '/pagesOrder/detail',query: {id: s.id,},})" >
+							<view class="item-info" @click="pageTo({url: '/pagesPurchase/purDetails',query: {id: s.id,},})" >
 								<view class="info-line">
 									<text class="item-name">单号:{{ s.orderSn }}</text>
 									<text class="item-price">
@@ -99,15 +99,15 @@
 			</view>
 
 			<view class="title">
-				客户
+				供应商
 			</view>
 			<view class="address-des_bx content-box">
 				<view>
-					<view> {{ detailInfo.customName }} {{ detailInfo.customMobile }} </view>
+					<view> {{ detailInfo.ghsName }} {{ detailInfo.ghsMobile }} </view>
 				</view>
 				<view>
 					<i
-						@click="callUp(detailInfo.customMobile)"
+						@click="callUp(detailInfo.ghsMobile)"
 						class="iconfont icondianhua1"
 					></i>
 				</view>

+ 1 - 1
ghsApp/src/admin/clear/list.vue

@@ -38,7 +38,7 @@ export default {
 			let options = {
 				page: this.list.page,
 				pageSize: this.list.pageSize,
-				customId:this.option.customId
+				ghsId:this.option.ghsId
 			};
 			return getClearList(options).then(res => {
 					this.completes(res);

+ 2 - 2
ghsApp/src/admin/clear/orderItem.vue

@@ -2,9 +2,9 @@
 	<view class="order-item-view" @click="clickItemEvent">
 		<view class="item-header">
 			<view class="title">
-				<image class="icon" :src="info.customAvatar" alt="" />
+				<image class="icon" :src="info.ghsAvatar" alt="" />
 				<text class="name">
-					{{ info.customName }}
+					{{ info.ghsName }}
 				</text>
 			</view>
 			<view class="status">已结账</view>

+ 1 - 1
ghsApp/src/pagesGys/details.vue

@@ -196,7 +196,7 @@ export default {
 		// 支付成功
 		async paySuccess(parameter) {
 			await clearOrderApi(parameter);
-			this.pageTo({url:'/admin/common/pageSuccess?title=结算成功', type: 2});
+			this.pageTo({url:'/common/pageSuccess?title=结算成功', type: 2});
 		},
 		payFail() {
 		}

+ 1 - 1
ghsApp/src/pagesOrder/refund.vue

@@ -223,7 +223,7 @@ export default {
 				success: function (res) {
 					if (res.confirm) {
 						refund(parameter).then(res => {
-							uni.navigateTo({url:'/admin/common/pageSuccess?title=操作成功'})
+							uni.navigateTo({url:'/common/pageSuccess?title=操作成功'})
 						})
 					}
 				},

+ 2 - 2
ghsApp/src/pagesPurchase/supplier.vue

@@ -29,7 +29,7 @@
               <view class="btn_entrance btn_forbid" v-else @click.stop="" >
                 结账
               </view>
-              <view class="btn_entrance">
+              <view class="btn_entrance" @click.stop="pageTo({ url: '/admin/clear/list',query: {ghsId: item.id}})">
                 月结单
               </view>
             </view>
@@ -183,4 +183,4 @@ export default {
 	}
 }
 }
-</style>
+</style>

+ 12 - 22
hdApp/dist/build/mp-weixin/project.config.json

@@ -4,39 +4,29 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": true,
+    "urlCheck": true,
+    "scopeDataCheck": false,
+    "coverView": true,
+    "es6": false,
     "postcss": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
     "preloadBackgroundData": false,
     "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
     "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
+    "newFeature": false,
     "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
     "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
+    "useIsolateContext": true,
+    "nodeModules": false,
+    "enhance": true,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
     "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
+    "showShadowRootInWxmlPanel": true,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "showES6CompileOption": false
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
   "libVersion": "",