lilei 2 anni fa
parent
commit
030d5306d8
4 ha cambiato i file con 17 aggiunte e 6 eliminazioni
  1. 5 4
      App.vue
  2. 1 1
      api/bundel.js
  3. 10 0
      api/request.js
  4. 1 1
      pages/checkReport/index.vue

+ 5 - 4
App.vue

@@ -1,15 +1,16 @@
 <script>
 	export default {
 		globalData: {
-			// baseUrl: 'http://192.168.0.216:7904/beauty-customer/', // 本地
-			baseUrl: 'https://cust.test.baibaibai.net/beauty-customer/', // 预发布
+			baseUrl: 'http://192.168.0.103:7904/beauty-customer/', // 本地
+			// baseUrl: 'https://cust.test.baibaibai.net/beauty-customer/', // 预发布
 			// baseUrl: 'https://cust.baibaibai.net/beauty-customer/' ,// 生产
+			extraData: ''
 		},
 		onLaunch: function() {
 			console.log('App Launch');
 		},
-		onShow: function() {
-			console.log('App Show');
+		onShow: function(opts) {
+			this.$set(this.$scope.globalData,"extraData",opts.referrerInfo.extraData)
 		},
 		onHide: function() {
 			console.log('App Hide');

+ 1 - 1
api/bundel.js

@@ -41,6 +41,6 @@ export const checkApiQueryList = params => {
   return request({
     url: `api/checkBill/queryPage/${params.pageNo}/${params.pageSize}`,
     method: 'post',
-    data: params
+    data: {customerIdEnc: params.customerIdEnc}
   })
 }

+ 10 - 0
api/request.js

@@ -18,6 +18,16 @@ function request(options) {
 	_obj.header = header
 	_obj.header['X-HEADER-APPID'] = '!z2Yc.aes|+Dtf7OBN+iytt6MIem2RukRIvLjBhIS/whu4EuxvvFk=';
 	
+	// 其它小程序传的参数
+	const apiHeader = getApp().globalData.extraData
+	console.log(apiHeader,'apiHeader')
+	if(apiHeader){
+		_obj.header['X-MERCHANT-NO'] = apiHeader['X-MERCHANT-NO']
+		_obj.header['X-SIGN-TYPE'] = apiHeader['X-SIGN-TYPE']
+		_obj.header['X-SIGN-INFO'] = apiHeader['X-SIGN-INFO']
+		_obj.header['X-TIMESTAMP'] = apiHeader['X-TIMESTAMP']
+	}
+	
     _obj.url = baseUrl + _obj.url;
     _obj.method = _obj.method.toUpperCase();
     _obj.success = function(res) {

+ 1 - 1
pages/checkReport/index.vue

@@ -48,7 +48,7 @@
 				status: '',
 				noDataText: '暂无数据',
 				pageNo: 1,
-				pageSize: 15,
+				pageSize: 10,
 				list: [],
 				total: 0,
 				userId: '',