shish пре 5 година
родитељ
комит
a6024719c6
3 измењених фајлова са 9 додато и 8 уклоњено
  1. 1 1
      ghsApp/src/App.vue
  2. 6 6
      ghsApp/src/admin/home/workbench.vue
  3. 2 1
      pt/vue.config.js

+ 1 - 1
ghsApp/src/App.vue

@@ -15,7 +15,7 @@ export default {
 		// #ifdef H5
 		// #ifdef H5
 		// H5开发环境无法微信授权,使用固定的用户 shish 2020.4.30
 		// H5开发环境无法微信授权,使用固定的用户 shish 2020.4.30
 		if (process.env.NODE_ENV == "development") {
 		if (process.env.NODE_ENV == "development") {
-			uni.setStorageSync("token","eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfNTIifQ.eyJpc3MiOiJodHRwczpcL1wvYXBpLnNob3AuaHpnaGQuY29tIiwiYXVkIjoiaHR0cHM6XC9cL2FwaS5zaG9wLmh6Z2hkLmNvbSIsImp0aSI6IjBfNTIiLCJpYXQiOjE2MTYxNTc2NjQsIm5iZiI6MTYxNjE1NzY2NCwiZXhwIjoxNjI0Nzk3NjY0LCJ1bmlxdWVJZCI6IjUyIiwic291cmNlSWQiOjB9.VzSekbSwSczMWsfdPVdrm3gZ-v9o3p01NbMVNT4nGZ4")
+			uni.setStorageSync("token","eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfMSJ9.eyJpc3MiOiJodHRwOlwvXC9hcGkuc2hvcC5oemdoZC5jb20iLCJhdWQiOiJodHRwOlwvXC9hcGkuc2hvcC5oemdoZC5jb20iLCJqdGkiOiIwXzEiLCJpYXQiOjE2MTg0MDg4NTcsIm5iZiI6MTYxODQwODg1NywiZXhwIjoxNjI3MDQ4ODU3LCJ1bmlxdWVJZCI6IjEiLCJzb3VyY2VJZCI6MH0.iDSEqewx8D1vdiyhQDkfBJBDWljF4zK19M0uqhGmLe4")
 			uni.setStorageSync("account", "0")
 			uni.setStorageSync("account", "0")
 			getDictionaries({ token: uni.getStorageSync('token') }).then(res => {
 			getDictionaries({ token: uni.getStorageSync('token') }).then(res => {
 				if (util.isEmpty(res)) {
 				if (util.isEmpty(res)) {

+ 6 - 6
ghsApp/src/admin/home/workbench.vue

@@ -265,15 +265,15 @@ export default {
 				},
 				},
 				{
 				{
 					name: "总收入",
 					name: "总收入",
-					value: 0
+					value: 0.00
 				},
 				},
 				{
 				{
 					name: "总支出",
 					name: "总支出",
-					value: 0
+					value: 0.00
 				},
 				},
 				{
 				{
 					name: "总采购",
 					name: "总采购",
-					value: 0
+					value: 0.00
 				}
 				}
 			],
 			],
 			cgSrc: `${this.$constant.imgUrl}/ghs/home/cg.png`,
 			cgSrc: `${this.$constant.imgUrl}/ghs/home/cg.png`,
@@ -331,11 +331,11 @@ export default {
 					this.orderData[2].value = todayData.order;
 					this.orderData[2].value = todayData.order;
 					// 总览数据
 					// 总览数据
 					this.totalData[0].value = asset.totalUser;
 					this.totalData[0].value = asset.totalUser;
-					this.totalData[1].value = asset.totalMember;
-					this.totalData[2].value = asset.totalVisit;
+					this.totalData[1].value = asset.totalView;
+					this.totalData[2].value = asset.finishOrder;
 					this.totalData[3].value = asset.totalIncome;
 					this.totalData[3].value = asset.totalIncome;
 					this.totalData[4].value = asset.totalExpend;
 					this.totalData[4].value = asset.totalExpend;
-					this.totalData[5].value = asset.remainSmsNum;
+					this.totalData[5].value = asset.totalPurchase;
 				}
 				}
 			});
 			});
 		},
 		},

+ 2 - 1
pt/vue.config.js

@@ -3,7 +3,8 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 const isProduction = process.env.NODE_ENV === 'production';
 
 
 //http和https切换请修改这里,修改后需要重新运行npm run serve shish 2021.4.12
 //http和https切换请修改这里,修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = process.env.NODE_ENV === 'local' ? 'https://api.pt.huaml.com' : 'https://api.pt.huaml.com';
+const proxyTarget =
+	process.env.NODE_ENV == 'local' ? 'http://api.pt.huaml.com' : 'http://api.pt.huaml.com';
 
 
 function resolve(dir) {
 function resolve(dir) {
 	return path.join(__dirname, dir);
 	return path.join(__dirname, dir);