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

src/App.vue

@@ -18,19 +18,24 @@
 			// 服务规范教程视频
 			service_standard: {
 				"Course1": {
-					url: "https://xy-hybrid.kakalili.com/web/vivaVideo/home/static/img/videoen.mp4",
-					title: "第一节 接单服务标准",
-					desc: "1.不同车企品牌结算价格不一，675元-1890元不等；",
+					url: "https://qn-static.banshouhui.com/self-support/videoen.mp4",
+					title: "第一节 师傅考核规则",
+					desc: "接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。",
 				},
 				"Course2": {
-					url: "https://xy-hybrid.kakalili.com/web/vivaVideo/home/static/img/videoen.mp4",
-					title: "第二节 完工服务标准",
-					desc: "2.结算价格为包工包料价，安装材料根据车企品牌规格自行采购（电缆、空开、漏保）；",
+					url: "https://qn-static.banshouhui.com/self-support/videoen.mp4",
+					title: "第二节 安装材料及工具",
+					desc: "接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。",
 				},
 				"Course3": {
-					url: "https://xy-hybrid.kakalili.com/web/vivaVideo/home/static/img/videoen.mp4",
-					title: "第二节 结算服务标准",
-					desc: "3.需具备一定的作业工具：如液压压线钳、冲击钻、电锤、登高安全带、电锤、绝缘电阻仪（摇表）、交流充电模拟器等；",
+					url: "https://qn-static.banshouhui.com/self-support/videoen.mp4",
+					title: "第二节 安装施工规范",
+					desc: "接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。",
+				},
+				"Course4": {
+					url: "https://qn-static.banshouhui.com/self-support/videoen.mp4",
+					title: "第二节 录单上传要求",
+					desc: "接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。",
 				},
 			},
 			
@@ -46,10 +51,12 @@
 			that.globalData.token = util.getToken()
 			
 			AnalysysAgent.registerSuperProperty("platform", "self-support");
+			// 应用启动，或从后台进入前台显示
+			this.autoLogin()
 		},
 		onShow: function() {
 			// 应用启动，或从后台进入前台显示
-			this.autoLogin()
+			// this.autoLogin()
 		},
 		onHide: function() {
 			// 应用从前台进入后台
@@ -73,7 +80,9 @@
 				if (!res.data) {
 					return
 				}
-				callBack(vm, res.data)
+				if(typeof callBack == 'function') {
+					callBack(vm, res.data)
+				}
 				uni.hideLoading()
 				return res.data
 			
@@ -95,6 +104,7 @@
 							if (result) {
 								if (result.code == 200 && result.data) {
 									that.setUserData(result.data)
+									that.getBaseInfo(that)
 								}
 							} else {
 								uni.showModal({

src/common/api/index.js

@@ -8,16 +8,19 @@ import {
 	settledApiFun
 } from '@/common/api/settled.js';
 import { learnApiFun } from "@/common/api/learn.js";
+import { orderApiFun } from "@/common/api/order.js";
 let apiFun = function(vm) {
 	let commonApi = commonApiFun(vm);
 	let settledApi = settledApiFun(vm)
 	let cloudApi = cloudRulesApiFun(vm)
 	let learnApi=learnApiFun(vm)
+	let orderApi=orderApiFun(vm)
 	let apiUrl = {
 		...commonApi,
 		...settledApi,
 		...cloudApi,
-		...learnApi
+		...learnApi,
+		...orderApi,
 	}
 	return apiUrl
 }

src/common/api/order.js

+let orderApiFun = function(vm){
+	let listByRecommendOrder		= async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/recommend/order', params);
+	
+	const orderApi = {
+		listByRecommendOrder,
+	}
+	return orderApi
+}
+module.exports =  {
+	orderApiFun
+}
\ No newline at end of file

src/common/api/settled.js

@@ -36,7 +36,10 @@ let settledApiFun = function(vm){
 	let listOrderingTutorials = async (params = {}) => await vm.$u.get(ucenterApiUrl+'/v1/settled/get-course-rate', params);
 	
 	/* 更新接单教程状态 */
-	let saveCourseRate = async (params = {}) => await vm.$u.get(ucenterApiUrl+'/v1/settled/save-course-rate', params);
+	let saveCourseRate = async (params = {}) => await vm.$u.post(ucenterApiUrl+'/v1/settled/save-course-rate', params);
+	
+	/* 获取消息内容列表 */
+	let listByNotice = async (params = {}) => await vm.$u.get(ucenterApiUrl+'/v1/notice/list', params);
 	
 	const settledApi = {
 		getSettleBaseInfo,
@@ -52,6 +55,7 @@ let settledApiFun = function(vm){
 		checkSettleSignInfo,
 		listOrderingTutorials,
 		saveCourseRate,
+		listByNotice,
 	}
 	return settledApi
 }

src/pages.json

@@ -254,11 +254,6 @@
 				"path": "pages/settle/sign-contract", //启动页面，必选
 				"query": "" //启动参数，在页面的onLoad函数里面得到
 			},
-			{
-				"name": "订单列表", //模式名称
-				"path": "pages/order/index", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			},
 			{
 				"name": "订单 - 完工配置", //模式名称
 				"path": "pages/order/complete", //启动页面，必选

src/pages/learn/exam.vue

@@ -82,7 +82,7 @@
 						id: 'Course1',
 						courseId: 1,
 						title: '',
-						value: '已学习',
+						value: '去学习',
 						courseActive: {},
 						status: 1,
 						url: ''
@@ -104,6 +104,15 @@
 						courseActive: {},
 						status: 0,
 						url: ''
+					},
+					{
+						id: 'Course4',
+						courseId: 4,
+						title: '',
+						value: '去学习',
+						courseActive: {},
+						status: 0,
+						url: ''
 					}
 				],
 				tipsDescription: '接单考核可让您快速了解如何使用小程序，建议先查看学习教程'
@@ -160,8 +169,9 @@
 				that.$u.api
 					.listOrderingTutorials()
 					.then(res => {
+						debugger
 						const results = res.data;
-						if (res.status == 200 && results && results.length > 0) {
+						if (res.code == 200 && results && results.length > 0) {
 							that.tutorials.forEach((data, i) => {
 								if (results.hasOwnProperty(data.id)) {
 									data.status = results[data.id];

src/pages/settle/prompt.vue

@@ -8,11 +8,11 @@
 					</image>
 				</view>
 				<view class="txt-box">
-					<text :class="['title', {failed: status == 4} ,index ? 'active' : '']" v-for="(txt,index) in info.txtArr">{{txt}}</text>
+					<text :class="['title', {failed: status == 4} ,index ? 'active' : '']" v-for="(txt,index) in info.txtArr" :key="index">{{txt}}</text>
 				</view>
 				<view class="tips-box" v-if="info.tipsArr">
 					<text :class="['tips',info.tipsArr.length>1 && index===0 ? 'red' : '']"
-						v-for="(txt,index) in info.tipsArr">{{txt}}</text>
+						v-for="(txt,index) in info.tipsArr" :key="index">{{txt}}</text>
 				</view>
 				<view class="services-view">
 					<image class="service-info-image" :src="erweimaImage"></image>

src/utils/login.js

@@ -33,6 +33,7 @@ function authorization(data) {
         if (res) {
             if (res.code == 200 && res.data) {
                 app.setUserData(res.data)
+				app.getBaseInfo(app.$vm)
                 resolve(res);
             } else {
                 reject(res);
@@ -53,6 +54,7 @@ function signup(data) {
         if (res) {
             if (res.code == 200 && res.data) {
                 app.setUserData(res.data)
+				app.getBaseInfo(app.$vm)
                 resolve(res);
             } else {
                 uni.showModal({