Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

.env.js

@@ -2,7 +2,7 @@
 (function () {
 	let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境
 	let ENV_VAR = null;
-	let VERSION_NUMBER = '1.3.1';//版本号
+	let VERSION_NUMBER = '1.3.2';//版本号
 	//小程序是否审核通过，参数配置在ucenter库version表，对应版本号的is_audit设置为1，将显示学习视频
 	if (process.env.NODE_ENV === "development") {
 		if (NODE_ENV === 'dev') {

src/common/api/order.js

@@ -177,6 +177,10 @@ let orderApiFun = function(vm){
 	let otherUser = async (params = {}) => await vm.$u.get(prefix + 'other/auth/' + vm.vuex_token + '/other/user', params);
 	// 是否添加客服
 	let checkAddCustomer = async (params = {}) => await vm.$u.get(prefix + 'order/revision/' + vm.vuex_token + '/checkAddCustomer', params);
+	// 工单文件标签
+	let fileLabel = async (params = {}) => await vm.$u.get(prefix + 'config/' + vm.vuex_token + '/finish/file/lable/', params);
+	// 工单文件列表
+	let fileList = async (params = {}) => await vm.$u.get(prefix + 'config/' + vm.vuex_token + '/finish/file', params);
 	
 	const orderApi = {
 		listByRecommendOrder,
@@ -218,6 +222,8 @@ let orderApiFun = function(vm){
 		allowLogin,
 		otherUser,
 		checkAddCustomer,
+		fileLabel,
+		fileList,
 		completeNextStep
 	}
 	return orderApi

src/common/http.interceptor.js

@@ -88,7 +88,8 @@ const install = (Vue, vm) => {
 				// return result;
 			case 200:
 				return {
-					data:result.data == null  ? result : result.data, // result.data的值为0， false, ''的时候也要算有值
+					// data:result.data == null  ? result : result.data, // result.data的值为0， false, ''的时候也要算有值
+					data:result.data,
 					code:code,
 					message:msg
 				};

src/pages.json

@@ -326,10 +326,10 @@
 				{
 					"path": "document",
 					"style": {
-						"navigationBarTitleText": "资料文件",
+						"navigationBarTitleText": "安装文件",
 						"navigationStyle": "custom",
-						"enablePullDownRefresh": false
-						// "disableScroll": true
+						"enablePullDownRefresh": false,
+						"disableScroll": true
 					}
 				}
 			]

src/pages/index/learn.vue

@@ -949,7 +949,7 @@ export default {
     /* position: absolute; */
 	position: relative;
     border-radius: 12rpx;
-    margin-top: 60rpx;
+    margin-top: 80rpx;
 }
 
 .title {

src/pages/order/detail.vue

@@ -682,7 +682,7 @@
 			},
 			// 去业务材料页面
 			handleClickFile() {
-				this.$u.route({url: 'pages/order/document'})
+				this.$u.route({url: 'pages/order/document' + '?partnerCompanyId=' + this.order.partnerCompanyId + '&brandId=' + this.order.lianbaoBrandId})
 			},
 			trackOrder() {
 				// 接单成功事件，签到成功事件