first commit

App.vue

@@ -1,181 +1,174 @@
 <script>
-	import Vue from 'vue'
+import Vue from "vue";
-  import util from '@/common/utils'
+import util from "@/common/utils";
-	import {
+import { mapGetters, mapActions, mapMutations } from "vuex";
-		mapGetters,
+export default {
-		mapActions,
+  computed: {
-		mapMutations
+    ...mapGetters({ user: "getUser" }),
-	} from 'vuex'
+  },
-	export default {
+  methods: {
+    ...mapActions(["memberLogin", "getLoginCode"]),
+    ...mapMutations(["setVisitChannels"]),
+    handleGetUserInfo() {
+      wx.request({
+        url: "https://qifu-api.baidubce.com/ip/local/geo/v1/district",
+        success(response) {
+          const data = response.data;
+          // 处理数据
+          let obj = {
+            ...data.data,
+            ip: data.ip,
+          };
+          console.log("obj", obj);
+          uni.setStorageSync("userInfo", obj);
+        },
+        fail(error) {
+          // 处理错误
+        },
+      });
+    },
+  },
+  onLaunch: function (options) {
+    uni.getSystemInfo({
+      success: function (e) {
+        // #ifndef MP
+        Vue.prototype.StatusBar = e.statusBarHeight;
+        if (e.platform == "android") {
+          Vue.prototype.CustomBar = e.statusBarHeight + 50;
+        } else {
+          Vue.prototype.CustomBar = e.statusBarHeight + 45;
+        }
+        // #endif
 
-		computed:{
+        // #ifdef MP-WEIXIN
-			...mapGetters({'user':'getUser'})
+        Vue.prototype.StatusBar = e.statusBarHeight;
-		},
+        let custom = wx.getMenuButtonBoundingClientRect();
-		methods: {
+        Vue.prototype.Custom = custom;
+        Vue.prototype.CustomBar =
+          custom.bottom + custom.top - e.statusBarHeight;
+        Vue.prototype.pageWindowHeight =
+          e.screenHeight - custom.bottom - custom.top + e.statusBarHeight;
+        // #endif
+      },
+    });
 
-			...mapActions(['memberLogin','getLoginCode']),
+    let _this = this;
-			...mapMutations(['setVisitChannels']),
+    if (this.user.WeChat_MiniProToken) {
-      handleGetUserInfo(){
+      this.memberLogin();
-        wx.request({
+    } else {
-          url: 'https://qifu-api.baidubce.com/ip/local/geo/v1/district',
+      this.getLoginCode();
-          success(response) {
+    }
-            const data = response.data;
+
-            // 处理数据
+    this.setVisitChannels(options.scene);
-            let obj = {
+    const updateManager = uni.getUpdateManager();
-              ...data.data,
+    updateManager.onUpdateReady(function (res) {
-              ip: data.ip
+      uni.showModal({
-            }
+        title: "更新提示",
-            console.log('obj',obj)
+        content: "新版本已经准备好，是否重启应用？",
-            uni.setStorageSync('userInfo',obj)
+        success(res) {
-          },
+          if (res.confirm) {
-          fail(error) {
+            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-            // 处理错误
+            updateManager.applyUpdate();
           }
-        });
+        },
-      }
+      });
-		},
+    });
-		onLaunch: function(options) {
-			uni.getSystemInfo({
-				success: function(e) {
-					// #ifndef MP
-					Vue.prototype.StatusBar = e.statusBarHeight;
-					if (e.platform == 'android') {
-						Vue.prototype.CustomBar = e.statusBarHeight + 50;
-					} else {
-						Vue.prototype.CustomBar = e.statusBarHeight + 45;
-					};
-					// #endif
 
-					// #ifdef MP-WEIXIN
+    this.handleGetUserInfo();
-					Vue.prototype.StatusBar = e.statusBarHeight;
-					let custom = wx.getMenuButtonBoundingClientRect();
-					Vue.prototype.Custom = custom;
-					Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight;
-					Vue.prototype.pageWindowHeight = e.screenHeight-custom.bottom - custom.top + e.statusBarHeight;;
-					// #endif
 
+    this.$util.addUserBehavior({
+      intoRoute: "/" + options.path,
+      outtoRoute: "",
+    }); // 记录用户行为
+  },
+  onShow: function () {
+    // var pages = getCurrentPages() // 获取加载的页面
+    //     let len = pages.length
+    //     if (len > 0) {
+    //       var currentPage = pages[len - 1] // 获取当前页面的对象
+    //       var nowRoute = '/' + currentPage.route // 当前页面url
+    //       this.$util.addUserBehavior({intoRoute: nowRoute, outtoRoute: ''}) // 记录用户行为
+    //     }
+    // uni.hideTabBar()
+  },
+  onHide: function (options) {
+    let pages = getCurrentPages(); // 获取加载的页面
 
-				}
+    let len = pages.length;
-			})
+    if (len > 0) {
-
+      let currentPage = pages[len - 1]; // 获取当前页面的对象
-			let _this = this
+      let nowRoute = "/" + currentPage.route; // 当前页面url
-			if (this.user.WeChat_MiniProToken) {
+      this.$util.addUserBehavior({ intoRoute: "", outtoRoute: nowRoute }); // 记录用户行为
-				this.memberLogin()
+    }
-			} else {
+  },
-				this.getLoginCode()
+};
-			}
-
-			this.setVisitChannels(options.scene)
-			const updateManager = uni.getUpdateManager()
-			updateManager.onUpdateReady(function(res) {
-				uni.showModal({
-					title: '更新提示',
-					content: '新版本已经准备好，是否重启应用？',
-					success(res) {
-						if (res.confirm) {
-							// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-							updateManager.applyUpdate();
-						}
-					}
-				});
-
-			});
-
-      this.handleGetUserInfo()
-
-			this.$util.addUserBehavior( {intoRoute: '/'+options.path, outtoRoute: ''}) // 记录用户行为
-		},
-		onShow: function() {
-
-			// var pages = getCurrentPages() // 获取加载的页面
-			//     let len = pages.length
-			//     if (len > 0) {
-			//       var currentPage = pages[len - 1] // 获取当前页面的对象
-			//       var nowRoute = '/' + currentPage.route // 当前页面url
-			//       this.$util.addUserBehavior({intoRoute: nowRoute, outtoRoute: ''}) // 记录用户行为
-			//     }
-      // uni.hideTabBar()
-		},
-		onHide: function(options) {
-			let pages = getCurrentPages() // 获取加载的页面
-
-			let len = pages.length
-			if (len > 0) {
-				let currentPage = pages[len - 1] // 获取当前页面的对象
-				let nowRoute = '/' + currentPage.route // 当前页面url
-				this.$util.addUserBehavior( {intoRoute: '', outtoRoute:nowRoute}) // 记录用户行为
-			}
-		}
-	}
 </script>
 
 <style>
-	@import url("./common/uni.css");
+@import url("./common/uni.css");
-	/*每个页面公共css */
+/*每个页面公共css */
-	page {
+page {
-		font-size: 26rpx;
+  font-size: 26rpx;
-		color: #333;
+  color: #333;
-		height: 100%;
+  height: 100%;
-		background-color: #f8f9fb;
+  background-color: #f8f9fb;
-		line-height: 1.2;
+  line-height: 1.2;
+}
 
-	}
+/* 加载更多 */
+.load-more {
+  text-align: center;
+  width: 100%;
+  height: 80rpx;
+  color: #9999;
+  font-size: 24rpx;
+}
 
-	/* 加载更多 */
+/* 审核环节最后一个加底部边距 */
-	.load-more {
+.process-box.uni-active {
-		text-align: center;
+  padding-bottom: 30rpx;
-		width: 100%;
+}
-		height: 80rpx;
+.process-box process-unit:nth-last-child(1) .prosess-unit::before {
-		color: #9999;
+  content: "";
-		font-size: 24rpx;
+  width: 0rpx;
-	}
+}
+.ico,
+.ico-s {
+  display: block;
+}
 
-	/* 审核环节最后一个加底部边距 */
+.ico-s:before,
-	.process-box.uni-active {
+.ico:before {
-		padding-bottom: 30rpx;
+  content: "";
-	}
+  width: 36rpx;
-	.process-box process-unit:nth-last-child(1) .prosess-unit::before{
+  height: 34rpx;
-		content: '';
+  display: block;
-		width: 0rpx;
-	}
-	.ico,
-	.ico-s {
-		display: block;
 
-	}
+  margin-right: 6rpx;
+  background-repeat: no-repeat;
+  background-size: contain;
+  background-position: center;
+}
 
-	.ico-s:before,
+.ico-s:before {
-	.ico:before {
+  width: 18rpx;
-		content: '';
+  height: 18rpx;
-		width: 36rpx;
+}
-		height: 34rpx;
-		display: block;
 
-		margin-right: 6rpx;
+.ico-fj:before {
-		background-repeat: no-repeat;
+  background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/fjwj.png");
-		background-size: contain;
+}
-		background-position: center;
-	}
 
-	.ico-s:before {
+.ico-tp:before {
-		width: 18rpx;
+  background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/fjtp.png");
-		height: 18rpx;
+}
-	}
 
-	.ico-fj:before {
+.ico-bz:before {
-		background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/fjwj.png');
+  background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/tender/yj.png");
-	}
+}
 
-	.ico-tp:before {
+/* #ifdef MP-WEIXIN */
-		background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/fjtp.png');
+/*
-	}
-
-	.ico-bz:before {
-		background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/tender/yj.png');
-	}
-
-	/* #ifdef MP-WEIXIN */
-	/*
 		checkbox .wx-checkbox-input {
 			border-radius: 20%;
 			border: 1rpx solid #91A6D7;
@@ -193,25 +186,25 @@
 			font-size: 30rpx;
 		} */
 
-		 checkbox .wx-checkbox-input {
+checkbox .wx-checkbox-input {
-			border-radius: 50% ;
+  border-radius: 50%;
-			background-color: #D8DFEE ;
+  background-color: #d8dfee;
-			width: 38rpx ;
+  width: 38rpx;
-			height: 38rpx ;
+  height: 38rpx;
-			color: #fff;
+  color: #fff;
-		 }
+}
 
-		 checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-			background-color: #2E6CF6;
+  background-color: #2e6cf6;
-			border-color: #2E6CF6 ;
+  border-color: #2e6cf6;
-			color: #fff !important;
+  color: #fff !important;
-		 }
+}
 
-		 checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
+checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
-			font-size: 30rpx;
+  font-size: 30rpx;
-		 }
+}
-	/* #endif */
+/* #endif */
-	button::after{
+button::after {
-		border: none;
+  border: none;
-	}
+}
 </style>

common/css/expensesTop.css

@@ -229,7 +229,7 @@ h4 {
 		background-image: url('/static/images/expense/rzlx.png');
 	}
 	.ico-khyh:before{
-		background-image: url('/static/images/expense/khyh.png');
+		background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/expense/khyh.png');
 	}
 	.ico-dw:before{
 		background-image: url('/static/images/expense/dw.png');
@@ -241,7 +241,7 @@ h4 {
 		background-image: url('/static/images/expense/ccsy.png');
 	}
 	.ico-ccry:before{
-		background-image: url('/static/images/expense/ccry.png');
+		background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/expense/ccry.png');
 	}
 	.ico-xmgl:before{
 		background-image: url('/static/images/expense/xmgl.png');
@@ -274,7 +274,7 @@ h4 {
 		background-image: url('/static/images/tender/lxr.png');
 	}
 	.ico-zcyz:before{
-		background-image: url('/static/images/expense/zcyz.png');
+		background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/expense/zcyz.png');
 	}
 	.ico-zcmc:before{
 		background-image: url('/static/images/expense/zcmc.png');
@@ -286,5 +286,5 @@ h4 {
 		background-image: url('/static/images/expense/gzsl.png');
 	}
 	.ico-jfmc:before{
-		background-image: url('/static/images/expense/jfmc.png');
+		background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/expense/jfmc.png');
 	}

common/css/tenderingDetail.css

@@ -187,10 +187,10 @@
 		background-image: url('/static/images/tender/bgw.png');
 	}
 	.ico-zbr:before{
-		background-image: url('/static/images/tender/zbr.png');
+		background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/tender/zbr.png');
 	}
 	.ico-jdr:before{
-		background-image: url('/static/images/tender/jdr.png');
+		background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/tender/jdr.png');
 	}
 	.ico-fdhfqk:before{
 		background-image: url('/static/images/tender/fdhfqk.png');
@@ -211,7 +211,7 @@
 		background-image: url('/static/images/tender/xmgm.png');
 	}
 	.ico-zbfs:before{
-		background-image: url('/static/images/tender/zbfs.png');
+		background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/tender/zbfs.png');
 	}
 	.ico-qtyq:before{
 		background-image: url('/static/images/tender/yj.png');

common/utils.js

@@ -65,7 +65,7 @@ import request from '@/util/index.js'
 // }
 
 const netChange = () => {
-	uni.onNetworkStatusChange(function(res) {
+	uni.onNetworkStatusChange(function (res) {
 		// console.log(res.isConnected)
 		store.mutations.isConnect(res.isConnected)
 		if (!res.isConnected) {
@@ -110,24 +110,25 @@ const fmoney = (s, n) => {
 	for (let i = 0; i < l.length; i++) {
 		t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? "," : "");
 	}
-	if (n===0){
+	if (n === 0) {
 		return s
-	}else{
+	} else {
 		return fuhao + [...t].reverse().join("") + "." + r;
 	}
 }
 
 
 // 四舍五入不保留小数的 金额化数字方法
-function noDecimal(s){
+function noDecimal(s) {
-	console.log('s',s)
+	console.log('s', s)
 	let fuhao = ''; //如果数字小于零则值为-
 	if (s < 0) {
 		s = Math.abs(s);
 		fuhao = '-'
 	}
 	s = parseFloat((s + "").replace(/[^\d\.-]/g, "")) + ""
-	let  l = s.split(".")[0].split("").reverse(), r = s.split(".")[1];
+	let l = s.split(".")[0].split("").reverse(),
+		r = s.split(".")[1];
 	let t = ''
 	for (let i = 0; i < l.length; i++) {
 		t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? "," : "");
@@ -144,11 +145,11 @@ function changeStringToDate(s) {
 	if (s.length === 14) {
 		return s.substring(0, 4) + '-' + s.substring(4, 6) + '-' + s.substring(6, 8) + ' ' +
 			s.substring(8, 10) + ':' + s.substring(10, 12) + ':' + s.substring(12, 14);
-	}
+	} else if (s.length === 8) {
-	else if (s.length === 8) {
 		return s.substring(0, 4) + '-' + s.substring(4, 6) + '-' + s.substring(6, 8);
 	}
 }
+
 function toNextRoute(type, url) {
 	uni[type]({
 		url: url,
@@ -161,6 +162,17 @@ function toNextRoute(type, url) {
 	})
 }
 
+function formatNumber(num) {
+	// 先保留两位小数，不四舍五入
+	num = Math.floor(num * 100) / 100;
+
+	// 添加千分号
+	let [integer, decimal] = num.toString().split('.');
+	integer = integer.replace(/\B(?=(\d{3})+(?!\d))/g, ','); // 千分号格式化
+
+	return decimal ? `${integer}.${decimal}` : integer; // 如果有小数部分则保留
+}
+
 // 记录用户行为的方法 每个页面的onUnload里面要调用
 function addUserBehavior(obj) {
 
@@ -184,22 +196,23 @@ function addUserBehavior(obj) {
 	let baseInfo = uni.getStorageSync('userInfo')
 
 	let req = {
-		userName:userDate.UserName,
+		userName: userDate.UserName,
-		phoneNumber:userDate.Membership_Phone,
+		phoneNumber: userDate.Membership_Phone,
-		userId:userDate.UserId ? userDate.UserId:'',
+		userId: userDate.UserId ? userDate.UserId : '',
-		wechatAppId:'wx4fb5da2b8d9e0e43',
+		wechatAppId: 'wx4fb5da2b8d9e0e43',
-		intoRoute:obj.intoRoute,
+		intoRoute: obj.intoRoute,
-		outtoRoute:obj.outtoRoute,
+		outtoRoute: obj.outtoRoute,
-		visitChannels:obj.visitChannels,
+		visitChannels: obj.visitChannels,
-		behaviorRecordDesc:'',
+		behaviorRecordDesc: '',
 		LoginIP: baseInfo.ip || '',
-		LoginPlace: (baseInfo.prov ? baseInfo.prov : '' ) + (baseInfo.prov && baseInfo.city ? '-' : '') + (baseInfo.city ? baseInfo.city : ''),
+		LoginPlace: (baseInfo.prov ? baseInfo.prov : '') + (baseInfo.prov && baseInfo.city ? '-' : '') + (baseInfo.city ? baseInfo.city : ''),
 		SOURCE_PLATFORM: '数智化看板'
 	}
-	request.$webGet('CommercialApi/UserBehavior/AddUserBehavior',req).then(() => {
+	request.$webGet('CommercialApi/UserBehavior/AddUserBehavior', req).then(() => {
 
 	})
 }
+
 function addUserBehaviorNew(obj) {
 
 	var pages = getCurrentPages() // 获取加载的页面
@@ -219,16 +232,16 @@ function addUserBehaviorNew(obj) {
 	obj.visitChannels = store.state.visitChannels
 	let userDate = store.state.userData
 	let req = {
-		userName:userDate.UserName,
+		userName: userDate.UserName,
-		phoneNumber:userDate.Membership_Phone,
+		phoneNumber: userDate.Membership_Phone,
-		userId:userDate.UserId ? userDate.UserId:'',
+		userId: userDate.UserId ? userDate.UserId : '',
-		wechatAppId:'wx4fb5da2b8d9e0e43',
+		wechatAppId: 'wx4fb5da2b8d9e0e43',
-		intoRoute:obj.intoRoute,
+		intoRoute: obj.intoRoute,
-		outtoRoute:obj.outtoRoute,
+		outtoRoute: obj.outtoRoute,
-		visitChannels:obj.visitChannels,
+		visitChannels: obj.visitChannels,
-		behaviorRecordDesc:''
+		behaviorRecordDesc: ''
 	}
-	request.$webGet('CommercialApi/UserBehavior/AddUserBehavior',req).then(() => {
+	request.$webGet('CommercialApi/UserBehavior/AddUserBehavior', req).then(() => {
 
 	})
 }
@@ -260,26 +273,35 @@ async function getFieldEnumByField(params) {
 
 
 // 得到这个月有多少天
-function getThisMonthDay(value){
+function getThisMonthDay(value) {
 	let date = new Date(value)
 	let y = date.getFullYear()
 	let m = date.getMonth() + 1
 	let howDay;
 	let flag = false
-	if( y%4 ===0 && y%100!==0 || y%400===0 ){
+	if (y % 4 === 0 && y % 100 !== 0 || y % 400 === 0) {
-		flag=true
+		flag = true
 	}
-	switch (m){
+	switch (m) {
-		case 1: case 3: case 5: case 7: case 8: case 10: case 12:
+		case 1:
-			howDay=31
+		case 3:
+		case 5:
+		case 7:
+		case 8:
+		case 10:
+		case 12:
+			howDay = 31
 			break
-		case 4: case 6: case 9: case 11:
+		case 4:
-			howDay=30
+		case 6:
+		case 9:
+		case 11:
+			howDay = 30
 			break
-		case 2 :
+		case 2:
-			if(flag){
+			if (flag) {
-				howDay=29
+				howDay = 29
-			}else{
+			} else {
 				howDay = 28
 			}
 			break
@@ -288,56 +310,56 @@ function getThisMonthDay(value){
 }
 
 // 输入时间拿到月份
-function getThisMonth(value){
+function getThisMonth(value) {
 	const date = new Date(value)
 	let y = date.getFullYear()
-	let m = date.getMonth()+1
+	let m = date.getMonth() + 1
-	if (m<10){
+	if (m < 10) {
-		m = '0'+m
+		m = '0' + m
 	}
 	return `${y}${m}`
 }
 // 输入时间得到带-的月份
-function getThisMonthHaveHeng(value){
+function getThisMonthHaveHeng(value) {
 	const date = new Date(value)
 	let y = date.getFullYear()
-	let m = date.getMonth()+1
+	let m = date.getMonth() + 1
-	if (m<10){
+	if (m < 10) {
-		m = '0'+m
+		m = '0' + m
 	}
 	return `${y}-${m}`
 }
 //有横杠
-function getThisMonthHave(value){
+function getThisMonthHave(value) {
 	const date = new Date(value)
 	let y = date.getFullYear()
-	let m = date.getMonth()+1
+	let m = date.getMonth() + 1
-	if (m<10){
+	if (m < 10) {
-		m = '0'+m
+		m = '0' + m
 	}
 	return `${y}-${m}`
 }
 
 // 显示月日
-function handleGetMonthDay(value){
+function handleGetMonthDay(value) {
 	const date = new Date(value)
-	let m = date.getMonth()+1
+	let m = date.getMonth() + 1
-	if (m<10){
+	if (m < 10) {
-		m = '0'+m
+		m = '0' + m
 	}
 	let d = date.getDate()
-	if (d<10){
+	if (d < 10) {
 		d = '0' + d
 	}
 	return `${m}-${d}`
 }
 
 // 输入时间拿到月份 输出月份的字符串
-function getThisTimeMonth(value){
+function getThisTimeMonth(value) {
 	const date = new Date(value)
-	let m = date.getMonth()+1
+	let m = date.getMonth() + 1
-	if (m<10){
+	if (m < 10) {
-		m = '0'+m
+		m = '0' + m
 	}
 	return `${m}`
 }
@@ -351,42 +373,54 @@ function playVideo(opt) {
 }
 
 // 输入年份和月份 输出该月的天数 是一个数组 格式为 *月**日
-function getThisMonthDateList(value){
+function getThisMonthDateList(value) {
 	let date = new Date(value)
 	let y = date.getFullYear()
 	let m = date.getMonth() + 1
 	let howDay;
 	let flag = false
-	if( y%4 ===0 && y%100!==0 || y%400===0 ){
+	if (y % 4 === 0 && y % 100 !== 0 || y % 400 === 0) {
 		flag = true
 	}
-	switch (m){
+	switch (m) {
-		case 1: case 3: case 5: case 7: case 8: case 10: case 12:
+		case 1:
-			howDay=31
+		case 3:
+		case 5:
+		case 7:
+		case 8:
+		case 10:
+		case 12:
+			howDay = 31
 			break
-		case 4: case 6: case 9: case 11:
+		case 4:
-			howDay=30
+		case 6:
+		case 9:
+		case 11:
+			howDay = 30
 			break
-		case 2 :
+		case 2:
-			if(flag){
+			if (flag) {
-				howDay=29
+				howDay = 29
-			}else{
+			} else {
 				howDay = 28
 			}
 			break
 	}
 	let list = []
-	for (let i = 0;i <= howDay,++i;) {
+	for (let i = 0; i <= howDay, ++i;) {
-		if (i>howDay){
+		if (i > howDay) {
 			break
-		}else{
+		} else {
-			list.push({label:`${m}月${i}日`,value:`${y}-${m<10?'0'+m:m}-${i<10?'0'+i:i}`})
+			list.push({
+				label: `${m}月${i}日`,
+				value: `${y}-${m<10?'0'+m:m}-${i<10?'0'+i:i}`
+			})
 		}
 	}
 	return list
 }
 // 传入 老的时间和要变成的时间 老时间要日期 新时间不用  月份为1无效
-function handleReduceAMonth(nowTime,newTime){
+function handleReduceAMonth(nowTime, newTime) {
 	const oldDate = new Date(nowTime)
 	let y = oldDate.getFullYear()
 	let m = oldDate.getMonth() + 1
@@ -395,106 +429,106 @@ function handleReduceAMonth(nowTime,newTime){
 	const newDate = new Date(newTime)
 	let newY = newDate.getFullYear()
 	let newM = newDate.getMonth() + 1
-	let thisMonth = newM<10?'0'+newM:newM
+	let thisMonth = newM < 10 ? '0' + newM : newM
 
 	let howDay = this.getThisMonthDay(`${y}-${m}`)
 	let newHowDay = this.getThisMonthDay(`${newY}-${thisMonth}`)
 	const nowDate = new Date()
-	let nowM =nowDate.getMonth() + 1
+	let nowM = nowDate.getMonth() + 1
 	let nowD = nowDate.getDate()
 
 
-		if (d === newHowDay){
+	if (d === newHowDay) {
-			if (d<nowD){
+		if (d < nowD) {
-				if (newM<10){
+			if (newM < 10) {
+				newM = '0' + newM
+			}
+			if (newHowDay < 10) {
+				newHowDay = '0' + newHowDay
+			}
+			return `${newY}-${newM}-${newHowDay}`
+		} else {
+			if (newM === nowM) {
+				if (newM < 10) {
 					newM = '0' + newM
 				}
-				if (newHowDay<10){
+				if (nowD < 10) {
+					nowD = '0' + nowD
+				}
+				return `${newY}-${newM}-${nowD}`
+			} else {
+				if (newM < 10) {
+					newM = '0' + newM
+				}
+				if (newHowDay < 10) {
 					newHowDay = '0' + newHowDay
 				}
 				return `${newY}-${newM}-${newHowDay}`
-			}else{
+			}
-				if (newM===nowM){
+		}
-					if (newM<10){
+	} else {
+		if (newM === 2) {
+			if (d > newHowDay) {
+				if (newM < 10) {
+					newM = '0' + newM
+				}
+				if (newHowDay < 10) {
+					newHowDay = '0' + newHowDay
+				}
+				return `${newY}-${newM}-${newHowDay}`
+			} else {
+				if (newM < 10) {
+					newM = '0' + newM
+				}
+				if (d < 10) {
+					d = '0' + d
+				}
+				return `${newY}-${newM}-${d}`
+			}
+		} else {
+			if (nowD < d) {
+				if (nowM === newM) {
+					if (newM < 10) {
 						newM = '0' + newM
 					}
-					if (nowD<10){
+					if (nowD < 10) {
 						nowD = '0' + nowD
 					}
 					return `${newY}-${newM}-${nowD}`
-				}else{
+				} else {
-					if (newM<10){
+					if (d < newHowDay) {
-						newM = '0' + newM
+						if (newM < 10) {
-					}
-					if (newHowDay<10){
-						newHowDay = '0' + newHowDay
-					}
-					return `${newY}-${newM}-${newHowDay}`
-				}
-			}
-		}else{
-			if (newM===2){
-				if (d>newHowDay){
-					if (newM<10){
-						newM = '0' + newM
-					}
-					if (newHowDay<10){
-						newHowDay = '0' + newHowDay
-					}
-					return `${newY}-${newM}-${newHowDay}`
-				}else{
-					if (newM<10){
-						newM = '0' + newM
-					}
-					if (d<10){
-						d = '0' + d
-					}
-					return `${newY}-${newM}-${d}`
-				}
-			}else{
-				if (nowD<d){
-					if (nowM===newM){
-						if (newM<10){
 							newM = '0' + newM
 						}
-						if (nowD<10){
+						if (d < 10) {
-							nowD = '0' + nowD
+							d = '0' + d
 						}
-						return `${newY}-${newM}-${nowD}`
+						return `${newY}-${newM}-${d}`
-					}else{
+					} else {
-						if (d<newHowDay){
+						if (newM < 10) {
-							if (newM<10){
+							newM = '0' + newM
-								newM = '0' + newM
-							}
-							if (d<10){
-								d = '0' + d
-							}
-							return `${newY}-${newM}-${d}`
-						}else{
-							if (newM<10){
-								newM = '0' + newM
-							}
-							if (newHowDay<10){
-								newHowDay = '0' +newHowDay
-							}
-							return `${newY}-${newM}-${newHowDay}`
 						}
+						if (newHowDay < 10) {
+							newHowDay = '0' + newHowDay
+						}
+						return `${newY}-${newM}-${newHowDay}`
+					}
 
-					}
-				}else {
-					if (newM<10){
-						newM = '0' + newM
-					}
-					if (d<10){
-						d = '0' +d
-					}
-					return `${newY}-${newM}-${d}`
 				}
+			} else {
+				if (newM < 10) {
+					newM = '0' + newM
+				}
+				if (d < 10) {
+					d = '0' + d
+				}
+				return `${newY}-${newM}-${d}`
 			}
 		}
+	}
 }
 // 不四舍五入 保留两位小数的金额化方法
-function getMoney(money){
+function getMoney(money) {
 	if (!money || isNaN(money)) return "0.00";
 	let num = parseFloat(money + '') + '';
 	num = parseInt(money * 100 + '') / 100 + ''
@@ -518,7 +552,7 @@ function getMoney(money){
 	return num;
 }
 // 不四舍五入 不保留两位小数的金额化方法
-function getMoneyNoDecimal(money){
+function getMoneyNoDecimal(money) {
 	if (!money || isNaN(money)) return "0";
 	let num = parseFloat(money + '') + '';
 	num = parseInt(money * 100 + '') / 100 + ''
@@ -539,23 +573,23 @@ function getMoneyNoDecimal(money){
 }
 // 封装的排序数组的方法
 // list 为排序的数组   field 为按照那个字段排序  type 正序还是倒序 1正 2倒
-const handleGetSortList = (list,field,type)=>{
+const handleGetSortList = (list, field, type) => {
-	if (list && list.length>0){
+	if (list && list.length > 0) {
 		let len = list.length
-		if (type===2){
+		if (type === 2) {
-			for (var i = 0; i < len - 1;i++){
+			for (var i = 0; i < len - 1; i++) {
 				for (var j = 0; j < len - 1 - i; j++) {
-					if (list[i][field]<list[j][field]){
+					if (list[i][field] < list[j][field]) {
 						var temp = list[j];
 						list[j] = list[j + 1];
 						list[j + 1] = temp;
 					}
 				}
 			}
-		}else{
+		} else {
-			for (var i = 0; i < len - 1;i++){
+			for (var i = 0; i < len - 1; i++) {
 				for (var j = 0; j < len - 1 - i; j++) {
-					if (list[i][field]>list[j][field]){
+					if (list[i][field] > list[j][field]) {
 						var temp = list[j];
 						list[j] = list[j + 1];
 						list[j + 1] = temp;
@@ -579,6 +613,7 @@ export default {
 	getThisTimeMonth,
 	handleGetMonthDay,
 	fmoney,
+	formatNumber,
 	noDecimal,
 	changeStringToDate,
 	toNextRoute,

components/filesComponent/fileUnit.vue

@@ -124,7 +124,7 @@
 	background-image: url('../../static/images/fileType/rarzip.png');
 }
 .ico-more:before{
-	background-image: url('../../static/images/fileType/more.png');
+	background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/fileType/more.png');
 }
 .ico-wjxz:before{
 	background-image: url('../../static/images/fileType/downLoad.png');

components/tabbar/tabbar.vue

@@ -6,12 +6,12 @@
           <image
             v-if="selectIndex === '/pages/index/index'"
             class="second"
-            src="/static/images/tabBar/company_active.png"
+            src="https://eshangtech.com/ShopICO/ahyd-BID/tabBar/company_active.png"
           ></image>
           <image
             v-else-if="selectIndex !== '/pages/index/index'"
             class="second"
-            src="/static/images/tabBar/company_normal.png"
+            src="https://eshangtech.com/ShopICO/ahyd-BID/tabBar/company_normal.png"
           ></image>
           <text v-if="selectIndex === '/pages/index/index'" class="text red">驿达</text>
           <text v-else-if="selectIndex !== '/pages/index/index'" class="text">驿达</text>
@@ -22,12 +22,12 @@
           <image
             v-if="selectIndex === '/pages/userCenter/userCenter'"
             class="second"
-            src="/static/images/tabBar/user_active.svg"
+            src="https://eshangtech.com/ShopICO/ahyd-BID/tabBar/user_active.svg"
           ></image>
           <image
             v-else-if="selectIndex !== '/pages/userCenter/userCenter'"
             class="second"
-            src="/static/images/tabBar/user_normal.svg"
+            src="https://eshangtech.com/ShopICO/ahyd-BID/tabBar/user_normal.svg"
           ></image>
           <text v-if="selectIndex === '/pages/userCenter/userCenter'" class="text red">我的</text>
           <text v-else-if="selectIndex !== '/pages/userCenter/userCenter'" class="text">我的</text>

pages.json

@@ -2,8 +2,7 @@
     "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
         {
             "path": "pages/index/index",
-            "style":
+            "style": {
-            {
                 "navigationBarTitleText": "驿达数智化看板",
                 "navigationStyle": "custom",
                 "enablePullDownRefresh": true
@@ -11,23 +10,20 @@
         },
         {
             "path": "pages/userCenter/userCenter",
-            "style":
+            "style": {
-            {
                 "navigationBarTitleText": "个人中心",
                 "navigationStyle": "custom"
             }
         },
         {
             "path": "pages/register/register",
-            "style":
+            "style": {
-            {
                 "navigationBarTitleText": "授权"
             }
         },
         {
             "path": "pages/webview/webview",
-            "style":
+            "style": {
-            {
                 "navigationBarTitleText": "驿达数智化看板"
             }
         }
@@ -35,21 +31,18 @@
     "subPackages": [ //分包加载配置
         {
             "root": "pages/index/old",
-            "pages": [
+            "pages": [{
-                {
+                "path": "index",
-                    "path": "index",
+                "style": {
-                    "style":{
+                    "navigationBarTitleText": "驿达数智化看板",
-                        "navigationBarTitleText": "驿达数智化看板",
+                    "navigationStyle": "custom",
-                        "navigationStyle": "custom",
+                    "enablePullDownRefresh": true
-                        "enablePullDownRefresh": true
-                    }
                 }
-            ]
+            }]
         },
         {
             "root": "pages/authorityApproval",
-            "pages": [
+            "pages": [{
-                {
                     "path": "index",
                     "style": {
                         "navigationBarTitleText": "权限审批",
@@ -58,8 +51,7 @@
                 },
                 {
                     "path": "detail",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "权限审批",
                         "enablePullDownRefresh": true
                     }
@@ -68,8 +60,7 @@
         },
         {
             "root": "pages/merchantAccount",
-            "pages": [
+            "pages": [{
-                {
                     "path": "index",
                     "style": {
                         "navigationBarTitleText": "",
@@ -87,26 +78,22 @@
         },
         {
             "root": "pages/settlementApproval",
-            "pages": [
+            "pages": [{
-                {
                     "path": "index",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": "结算审批"
                     }
                 },
                 {
                     "path": "detail",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "结算审批"
                     }
                 },
                 {
                     "path": "yearSettlement",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "年度结算"
                     }
                 }
@@ -114,32 +101,27 @@
         },
         {
             "root": "pages/auditingPop",
-            "pages": [
+            "pages": [{
-                {
                     "path": "jointlySign",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "会签"
                     }
                 },
                 {
                     "path": "transfer",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "移交"
                     }
                 },
                 {
                     "path": "toExamine",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "审核"
                     }
                 },
                 {
                     "path": "reject",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "驳回"
                     }
                 }
@@ -148,8 +130,7 @@
 
         {
             "root": "pages/nationalPage",
-            "pages": [
+            "pages": [{
-                {
                     "path": "index",
                     "style": {
                         "navigationBarTitleText": "",
@@ -172,16 +153,14 @@
                 },
                 {
                     "path": "nationalServerpart",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "服务区每日营收",
                         "enablePullDownRefresh": false
                     }
                 },
                 {
                     "path": "rankPage",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "服务区排名",
                         "enablePullDownRefresh": false,
                         "disableScroll": true,
@@ -190,16 +169,14 @@
                 },
                 {
                     "path": "testPage",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "",
                         "enablePullDownRefresh": false
                     }
                 },
                 {
                     "path": "merchantRevenue",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "商户排名",
                         "enablePullDownRefresh": false,
                         "disableScroll": true,
@@ -210,8 +187,7 @@
         },
         {
             "root": "pages/earlyWarning",
-            "pages": [
+            "pages": [{
-                {
                     "path": "index",
                     "style": {
                         "navigationBarTitleText": "",
@@ -249,8 +225,7 @@
         },
         {
             "root": "pages/revenue",
-            "pages": [
+            "pages": [{
-                {
                     "path": "index",
                     "style": {
                         "navigationBarTitleText": "",
@@ -275,8 +250,7 @@
         },
         {
             "root": "pages/revenueStatistics",
-            "pages": [
+            "pages": [{
-                {
                     "path": "index",
                     "style": {
                         "navigationBarTitleText": "",
@@ -301,20 +275,17 @@
         },
         {
             "root": "pages/newamine",
-            "pages": [
+            "pages": [{
-                {
+                "path": "index",
-                    "path": "index",
+                "style": {
-                    "style": {
+                    "navigationBarTitleText": "",
-                        "navigationBarTitleText": "",
+                    "navigationStyle": "custom"
-                        "navigationStyle": "custom"
-                    }
                 }
-            ]
+            }]
         },
         {
             "root": "pages/commercialBINew",
-            "pages": [
+            "pages": [{
-                {
                     "path": "flowAnalysis",
                     "style": {
                         "navigationBarTitleText": "",
@@ -333,15 +304,13 @@
         },
         {
             "root": "pages/summaryOfPortraits",
-            "pages": [
+            "pages": [{
-                {
+                "path": "index",
-                    "path": "index",
+                "style": {
-                    "style": {
+                    "navigationBarTitleText": "",
-                        "navigationBarTitleText": "",
+                    "navigationStyle": "custom"
-                        "navigationStyle": "custom"
-                    }
                 }
-            ]
+            }]
         },
 
         { // 商业BI
@@ -457,15 +426,13 @@
         {
             // 项目分润报表
             "root": "pages/projectProfitSharing",
-            "pages": [
+            "pages": [{
-                {
+                "path": "index",
-                    "path": "index",
+                "style": {
-                    "style": {
+                    "navigationBarTitleText": "",
-                        "navigationBarTitleText": "",
+                    "navigationStyle": "custom"
-                        "navigationStyle": "custom"
-                    }
                 }
-            ]
+            }]
         },
 
         {
@@ -491,8 +458,7 @@
         // 考核考评
         {
             "root": "pages/examine",
-            "pages": [
+            "pages": [{
-                {
                     "path": "index",
                     "style": {
                         "navigationBarTitleText": "",
@@ -511,8 +477,7 @@
         },
         {
             "root": "pages/projectWarning",
-            "pages": [
+            "pages": [{
-                {
                     "path": "index",
                     "style": {
                         "navigationBarTitleText": "分润比例切换"
@@ -529,31 +494,26 @@
         },
         {
             "root": "pages/robot",
-            "pages": [
+            "pages": [{
-                {
+                "path": "index",
-                    "path": "index",
+                "style": {
-                    "style":
+                    "navigationBarTitleText": "数智助手",
-                    {
+                    "navigationStyle": "custom"
-                        "navigationBarTitleText": "数智助手"
-                    }
                 }
-            ]
+            }]
         },
         {
             "root": "pages/map",
-            "pages": [
+            "pages": [{
-                {
                     "path": "index",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "",
                         "navigationStyle": "custom"
                     }
                 },
                 {
                     "path": "detail",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "",
                         "navigationStyle": "custom",
                         "disableScroll": true
@@ -568,11 +528,9 @@
         },
         {
             "root": "pages/operatingStatements",
-            "pages": [
+            "pages": [{
-                {
                     "path": "index",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "经营报表",
                         "enablePullDownRefresh": false,
                         "navigationBarBackgroundColor": "#647BD1",
@@ -581,8 +539,7 @@
                 },
                 {
                     "path": "detail",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "经营报表",
                         "enablePullDownRefresh": false,
                         "navigationBarBackgroundColor": "#647BD1",
@@ -591,8 +548,7 @@
                 },
                 {
                     "path": "operatingTrend",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "经营趋势",
                         "enablePullDownRefresh": false,
                         "navigationBarBackgroundColor": "#647BD1",
@@ -603,40 +559,34 @@
         },
         {
             "root": "pages/tender",
-            "pages": [
+            "pages": [{
-                {
                     "path": "tender",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": "招标投标"
                     }
                 },
                 {
                     "path": "tenderRecord",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "招标备案详情"
                     }
                 },
                 {
                     "path": "tenderAlteration",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "招标变更详情"
                     }
                 },
                 {
                     "path": "decisionRecord",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "决标备案详情"
                     }
                 },
                 {
                     "path": "specialProjects",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "专项工程详情",
                         "enablePullDownRefresh": false
                     }
@@ -645,19 +595,16 @@
         },
         {
             "root": "pages/serviceAreaReimbursement",
-            "pages": [
+            "pages": [{
-                {
                     "path": "serviceAreaReimbursement",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": "服务区报销"
                     }
                 },
                 {
                     "path": "detail",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": false,
                         "navigationBarTitleText": ""
                     }
@@ -666,27 +613,23 @@
         },
         {
             "root": "pages/dataSummary",
-            "pages": [
+            "pages": [{
-                {
                     "path": "dataSummary",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": "日结校验"
                     }
                 },
                 {
                     "path": "dayDetail",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarBackgroundColor": "#EAEBEB",
                         "navigationBarTitleText": "日结校验"
                     }
                 },
                 {
                     "path": "detail",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "日结校验"
                     }
                 }
@@ -694,19 +637,16 @@
         },
         {
             "root": "pages/businessApproval",
-            "pages": [
+            "pages": [{
-                {
                     "path": "businessApproval",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": "商品审批"
                     }
                 },
                 {
                     "path": "productDetail",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "商品审批"
                     }
                 }
@@ -714,51 +654,44 @@
         },
         {
             "root": "pages/everdayRenven",
-            "pages": [
+            "pages": [{
-                {
                     "path": "index",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": false,
                         "navigationBarTitleText": "每日营收汇总"
                     }
                 },
                 {
                     "path": "detail",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": false,
                         "navigationBarTitleText": "每日营收"
                     }
                 },
                 {
                     "path": "serviceIndex",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": false,
                         "navigationBarTitleText": "服务区每日营收"
                     }
                 },
                 {
                     "path": "serviceDetail",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": false,
                         "navigationBarTitleText": "服务区每日营收"
                     }
                 },
                 {
                     "path": "AnhuiIndex",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "每日营收汇总",
                         "enablePullDownRefresh": false
                     }
                 },
                 {
                     "path": "AnhuiServerpart",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "服务区每日营收",
                         "enablePullDownRefresh": false
                     }
@@ -767,19 +700,16 @@
         },
         {
             "root": "pages/suggestion",
-            "pages": [
+            "pages": [{
-                {
                     "path": "suggestion",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": "投诉建议"
                     }
                 },
                 {
                     "path": "suggestionDetail",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "投诉建议"
                     }
                 }
@@ -787,19 +717,16 @@
         },
         {
             "root": "pages/contract",
-            "pages": [
+            "pages": [{
-                {
                     "path": "contract",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": "合同审批"
                     }
                 },
                 {
                     "path": "detail",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "合同审批"
                     }
                 }
@@ -807,26 +734,22 @@
         },
         {
             "root": "pages/cashAudit",
-            "pages": [
+            "pages": [{
-                {
                     "path": "list",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": "收银稽核"
                     }
                 },
                 {
                     "path": "detail",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "收银稽核详情"
                     }
                 },
                 {
                     "path": "check",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "收银稽核反馈"
                     }
                 }
@@ -834,19 +757,16 @@
         },
         {
             "root": "pages/investment",
-            "pages": [
+            "pages": [{
-                {
                     "path": "investment",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": "招商审批"
                     }
                 },
                 {
                     "path": "investmentDetail",
-                    "style":
+                    "style": {
-                    {
                         "navigationBarTitleText": "招商审批"
                     }
                 }
@@ -854,19 +774,16 @@
         },
         {
             "root": "pages/expenseApproval",
-            "pages": [
+            "pages": [{
-                {
                     "path": "expenseApproval",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": "财务审批"
                     }
                 },
                 {
                     "path": "expenseDetail",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": "财务审批"
                     }
@@ -875,24 +792,45 @@
         },
         {
             "root": "pages/commodity_temp",
-            "pages": [
+            "pages": [{
-                {
                     "path": "index",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": "资质审批"
                     }
                 },
                 {
                     "path": "detail",
-                    "style":
+                    "style": {
-                    {
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": "资质审批"
                     }
                 }
             ]
+        },
+        {
+            "root": "pages/testPage",
+            "pages": [{
+                "path": "index",
+                "style": {
+                    "navigationBarTitleText": "测试页面"
+                }
+            }]
+        },
+        {
+            "root": "pages/billOfLading",
+            "pages": [{
+                "path": "index",
+                "style": {
+                    "navigationBarTitleText": "提单"
+                }
+            }, {
+                "path": "detail",
+                "style": {
+                    "navigationBarTitleText": "",
+                    "navigationStyle": "custom"
+                }
+            }]
         }
     ],
     "globalStyle": {
@@ -906,8 +844,7 @@
         "selectedColor": "#3295f9",
         "borderStyle": "black",
         "backgroundColor": "#ffffff",
-        "list": [
+        "list": [{
-            {
                 "pagePath": "pages/index/index",
                 "iconPath": "static/images/tab/home.png",
                 "selectedIconPath": "static/images/tab/homeActive.png",

pages/askForLeave/newLeave.vue

@@ -9,12 +9,12 @@
 					<text>请假审批流程</text>
 				</view>
 				<!-- <view class="leave-type uni-flex uni-column" :class="{'active':selectType==461}" @tap="choeseSelect(461)">
-					<image src="../../static/images/leave/fwq-gl.png" mode="aspectFit" style="width: 67upx;height: 61upx;"></image>
+					<image src="https://eshangtech.com/ShopICO/ahyd-BID/leave/fwq-gl.png" mode="aspectFit" style="width: 67upx;height: 61upx;"></image>
 					<text class="type-title">服务区经营管理者</text>
 					<text>请假审批流程</text>
 				</view>
 				<view class="leave-type uni-flex uni-column" :class="{'active':selectType==462}" @tap="choeseSelect(462)">
-					<image src="../../static/images/leave/qy.png" mode="aspectFit" style="width: 67upx;height: 61upx;"></image>
+					<image src="https://eshangtech.com/ShopICO/ahyd-BID/leave/qy.png" mode="aspectFit" style="width: 67upx;height: 61upx;"></image>
 					<text class="type-title">区域员工</text>
 					<text>请假审批流程</text>
 				</view> -->
@@ -87,7 +87,7 @@
 			},
 			getProde(){
 				let _this =this
-				let img = ['/static/images/leave/fwq-yg.png','/static/images/leave/fwq-gl.png','/static/images/leave/qy.png']
+				let img = ['https://eshangtech.com/ShopICO/ahyd-BID/leave/fwq-yg.png','https://eshangtech.com/ShopICO/ahyd-BID/leave/fwq-gl.png','https://eshangtech.com/ShopICO/ahyd-BID/leave/qy.png']
 				this.$request.$get('GetProdefInfo',{}).then(res=>{
 					if(res.ResultCode==100){
 						_this.selectType =  res.Data.List[0].Prodef_Id

pages/billOfLading/detail.vue

@@ -0,0 +1,605 @@
+<template>
+  <view class="main">
+    <view class="header" :style="{ height: menu.bottom + 'px' }">
+      <image
+        @click="handleBack"
+        class="allowLeft"
+        :style="{ top: menu.top + (menu.height - 24) / 2 + 'px' }"
+        src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg"
+      ></image>
+    </view>
+    <p class="title">{{ item.BillState === 1 ? "已提单" : "提单申请" }}</p>
+
+    <view class="content">
+      <view class="detail">
+        <view
+          class="type"
+          :style="{ color: item.PaymentTerms === 1 ? 'red' : '' }"
+          >{{
+            detailInfo.PaymentTerms === 1
+              ? "收款"
+              : detailInfo.PaymentTerms === 0
+              ? "退款"
+              : ""
+          }}</view
+        >
+
+        <view class="top">
+          <view class="left">
+            <image
+              class="logo"
+              :src="
+                detailInfo.BUSINESSPROJECT_ICO
+                  ? detailInfo.BUSINESSPROJECT_ICO
+                  : 'https://eshangtech.com/ShopICO/yxcl/projectWarning/defaultImg.svg'
+              "
+            ></image>
+          </view>
+          <view class="right">
+            <p class="detailTitle">
+              {{
+                detailInfo.BusinessProcess_Name
+                  ? detailInfo.BusinessProcess_Name.split("】")[1]
+                  : "-"
+              }}
+            </p>
+            <view class="fixed">
+              <image
+                class="serviceFixed"
+                src="https://eshangtech.com/ShopICO/yxcl/projectWarning/position.svg"
+              ></image>
+              <span class="service">{{ detailInfo.Serverpart_Name }}</span>
+            </view>
+            <view class="other">
+              <view class="item">
+                <image
+                  class="icon"
+                  src="https://eshangtech.com/ShopICO/yxcl/projectWarning/user.svg"
+                ></image>
+                <span class="value">{{ detailInfo.Staff_Name || "-" }}</span>
+              </view>
+              <!-- <view class="item">
+                <image
+                  class="icon"
+                  src="https://eshangtech.com/ShopICO/yxcl/projectWarning/phone.svg"
+                ></image>
+                <span class="value">{{
+                  detailInfo.BusinessProcess_StartDate || "-"
+                }}</span>
+              </view> -->
+            </view>
+          </view>
+        </view>
+        <view class="bottom">
+          <view class="message">
+            <image
+              class="icon"
+              src="https://eshangtech.com/ShopICO/yxcl/projectWarning/money.svg"
+            ></image>
+            <span class="text">退补款</span>
+            <span class="money">{{
+              detailInfo.Liquidation_Amount || "-"
+            }}</span>
+          </view>
+          <view class="message">
+            <image
+              class="icon"
+              src="https://eshangtech.com/ShopICO/yxcl/projectWarning/phone.svg"
+            ></image>
+            <span class="text">提单时间</span>
+            <span class="money">{{
+              detailInfo.BusinessProcess_EndDate
+                ? $moment(detailInfo.BusinessProcess_EndDate).format(
+                    "YYYY/MM/DD"
+                  )
+                : "-"
+            }}</span>
+          </view>
+          <view class="message" style="margin-bottom: 0">
+            <image
+              class="icon"
+              src="https://eshangtech.com/ShopICO/yxcl/projectWarning/date.svg"
+            ></image>
+            <span class="text">本期时间</span>
+            <span class="money"
+              >{{ detailInfo.STARTDATE || "-" }} -
+              {{ detailInfo.ENDDATE || "-" }}</span
+            >
+          </view>
+        </view>
+      </view>
+
+      <view class="contentTextBox" v-if="detailInfo.BillState !== 1">
+        <textarea
+          v-model="desc"
+          :disabled="detailInfo.BillState === 1"
+        ></textarea>
+      </view>
+
+      <view class="contain" v-if="detailObj.APPLYAPPROVE_ID">
+        <view class="box">
+          <view class="store">
+            <view class="left">
+              <image class="img" src="/static/images/right-ico.png"></image>
+            </view>
+            <view class="right">
+              <view class="top">
+                <p class="storeText">
+                  【{{ detailObj.APPLYAPPROVE_NAME }}】
+                  {{ detailObj.STAFF_NAME.split("【")[0] }}：
+                </p>
+                <p class="storeTextRight">
+                  {{ detailObj.APPLYAPPROVE_INFO }}
+                </p>
+              </view>
+              <span class="other">{{ detailObj.APPLYAPPROVE_DATE }}</span>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <view class="bottomBtn" v-if="detailInfo.BillState !== 1">
+        <button class="btn change" @click="handleBillLading">发起提单</button>
+      </view>
+      <!-- <view class="bottomBtn" v-if="detailInfo.BillState === 1">
+        <button
+          :style="{
+            background: '#e0ba98',
+          }"
+          class="btn change"
+        >
+          已发起
+        </button>
+      </view> -->
+    </view>
+  </view>
+</template>
+<script>
+import { mapState } from "vuex";
+export default {
+  data() {
+    return {
+      menu: {}, // 手机信息
+      detailInfo: {}, // 结算业务信息
+      desc: "项目结算完成，发起提单审批流程", // 审核意见
+      isPush: false, // 是否为推送进入
+      selectId: "",
+      detailObj: {}, // 流程详情数据
+    };
+  },
+
+  computed: {
+    ...mapState({
+      user: (state) => {
+        return state.userData;
+      },
+    }),
+  },
+  onLoad(query) {
+    this.menu = uni.getMenuButtonBoundingClientRect();
+    // 判断是否为推送
+    if (query.ispush) {
+      this.isPush = true;
+    }
+    // 推送进的话 直接进来拿id去查详情
+    if (query.id) {
+      console.log("query.id", query.id);
+      this.selectId = query.id;
+      this.handleGetDetail(query.id);
+    }
+  },
+  methods: {
+    //   查详情
+    async handleGetDetail(id) {
+      uni.showLoading({
+        title: "加载中...",
+      });
+
+      const req = {
+        SearchParameter: {
+          BusinessApproval_ID: id,
+          BusinessProcess_State: 9000,
+          Operation_Type: 11,
+          PendState: 3,
+        },
+      };
+      const data = await this.$request.$webPost(
+        "EShangApiMain/Finance/GetMonthAccountProinst",
+        req
+      );
+      console.log("data", data);
+      let list = data.Result_Data.List;
+      if (list && list.length > 0) {
+        this.detailInfo = list[0];
+        this.detailInfo.Liquidation_Amount = this.$util.formatNumber(
+          this.detailInfo.Liquidation_Amount
+        );
+      }
+      console.log("this.detailInfo ", this.detailInfo);
+
+      if (this.detailInfo.BillState === 1) {
+        this.handleGetProgressList();
+      }
+
+      // let req = {
+      //   BUSINESSAPPROVALId: id,
+      // };
+      // const data = await this.$request.$webGet(
+      //   "EShangApiMain/BusinessProcess/GetBUSINESSAPPROVALDetail",
+      //   req
+      // );
+      // console.log("data", data);
+      // this.detailInfo = data.Result_Data;
+      // console.log("this.detailInfo", this.detailInfo);
+
+      uni.hideLoading();
+    },
+    //   返回上一页面
+    // 稍微判断一下 不重载列表页面
+    handleBack() {
+      if (this.isPush) {
+        uni.redirectTo({
+          url: "/pages/billOfLading/index",
+        });
+      } else {
+        uni.navigateBack({
+          delta: 1,
+        });
+      }
+    },
+    // 发起提单
+    async handleBillLading() {
+      if (!this.desc) {
+        uni.showToast({
+          title: "请先输入审核意见！",
+          icon: "none",
+        });
+        return;
+      }
+
+      console.log("user", this.user);
+      const req = {
+        businessApprovalID: this.detailInfo.BusinessApproval_ID,
+        approveedInfo: this.desc || "",
+        approveedStaffId: this.user.UserId,
+        approveedStaffName: this.user.UserName,
+      };
+      //   const data = await handleGetLadingBill(req);
+      const data = await this.$request.$webGet(
+        "EShangApiMain/Finance/LadingBill",
+        req
+      );
+      uni.showToast({
+        title: data.Result_Desc,
+        icon: "none",
+      });
+      let _this = this;
+      setTimeout(() => {
+        _this.handleGetDetail(_this.detailInfo.BusinessApproval_ID);
+      }, 2000);
+
+      //   if (data.Result_Code === 100) {
+      //     setTimeout(() => {
+      //       uni.navigateBack({
+      //         delta: 1,
+      //       });
+      //     });
+      //   }
+    },
+    // 已经提单了的 去拿到流程列表
+    async handleGetProgressList() {
+      const data = await this.$request.$webGet(
+        "EShangApiMain/BusinessProcess/GetBUSINESSAPPROVALDetail",
+        { BUSINESSAPPROVALId: this.selectId }
+      );
+      let list = data.Result_Data.approveList;
+      if (list && list.length > 0) {
+        let obj = list[list.length - 1];
+        this.detailObj = obj;
+        console.log("this.detailObj", this.detailObj);
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "/static/public/font/stylesheet.css";
+.main {
+  width: 100vw;
+  height: 100vh;
+  box-sizing: border-box;
+  background-image: url("https://eshangtech.com/ShopICO/yxcl/projectWarning/bg.svg");
+  background-size: cover;
+  .header {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 16px;
+    position: relative;
+    margin-top: 0;
+    z-index: 222;
+    .allowLeft {
+      position: absolute;
+      width: 24px;
+      height: 24px;
+      left: 16px;
+    }
+  }
+
+  .title {
+    font-size: 28px;
+    font-family: Alimama ShuHeiTi;
+    color: #160002;
+    line-height: 39px;
+    margin: 18px 0 16px 16px;
+    background: linear-gradient(180deg, #c25e18 30%, #8c4917 100%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+  }
+
+  .content {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 32rpx;
+    .detail {
+      width: 100%;
+      box-sizing: border-box;
+      background: linear-gradient(
+        314deg,
+        #fffcf3 0%,
+        #fff0e6 20%,
+        #fff9f5 51%,
+        #fff8e7 73%,
+        #fff6ee 100%
+      );
+      border-radius: 8px;
+      padding: 16px;
+      position: relative;
+      .type {
+        position: absolute;
+        right: 0;
+        top: 55px;
+        background: linear-gradient(
+          270deg,
+          #f8d792 0%,
+          #ffe6b2 50%,
+          #fbc13b 100%
+        );
+        border-radius: 10px 0 0 2px;
+        padding: 2px 8px;
+        font-size: 14px;
+        font-family: PingFangSC-Regular;
+        font-weight: 400;
+        color: #604128;
+        line-height: 20px;
+      }
+      .top {
+        width: 100%;
+        height: 168rpx;
+        display: flex;
+        align-items: center;
+        .left {
+          width: 168rpx;
+          height: 168rpx;
+          margin-right: 12px;
+          border-radius: 8px;
+          overflow: hidden;
+          .logo {
+            width: 168rpx;
+            height: 168rpx;
+          }
+        }
+        .right {
+          width: calc(100% - 180rpx);
+          //display: flex;
+          //flex-direction: column;
+          //justify-content: space-between;
+          //align-items: flex-start;
+          .detailTitle {
+            font-size: 30rpx;
+            width: 100%;
+            font-family: PingFangSC-Semibold, PingFang SC;
+            font-weight: 600;
+            color: #160002;
+            margin-bottom: 12rpx;
+            line-height: 32rpx;
+            display: -webkit-box;
+            -webkit-line-clamp: 2; /* 设置显示的行数 */
+            -webkit-box-orient: vertical;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+          .fixed {
+            height: 24px;
+            line-height: 24px;
+            padding: 1px 4px;
+            box-sizing: border-box;
+            background: rgba(252, 186, 118, 0.2);
+            border-radius: 4px;
+            display: inline-block;
+            margin-bottom: 12rpx;
+            .serviceFixed {
+              width: 20rpx;
+              height: 24rpx;
+              margin-right: 8rpx;
+              line-height: 24px;
+            }
+            .service {
+              font-size: 28rpx;
+              font-family: PingFangSC-Semibold, PingFang SC;
+              font-weight: 600;
+              color: #6c492a;
+              line-height: 40rpx;
+            }
+          }
+          .other {
+            width: 100%;
+            display: flex;
+            align-items: center;
+            .item {
+              display: flex;
+              align-items: center;
+              margin-right: 16px;
+              .icon {
+                width: 16px;
+                height: 16px;
+                margin-right: 6px;
+              }
+              .value {
+                font-size: 28rpx;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #160002;
+                line-height: 40rpx;
+                white-space: nowrap;
+              }
+            }
+          }
+        }
+      }
+      .bottom {
+        margin-top: 24px;
+        .message {
+          width: 100%;
+          display: flex;
+          align-items: center;
+          margin-bottom: 8px;
+          .icon {
+            width: 16px;
+            height: 16px;
+            margin-right: 8px;
+          }
+          .text {
+            font-size: 14px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #786b6c;
+            line-height: 20px;
+            margin-right: 8px;
+          }
+          .money {
+            font-size: 14px;
+            font-family: PingFangSC-Semibold, PingFang SC;
+            font-weight: 600;
+            color: #7d5632;
+            line-height: 20px;
+          }
+        }
+      }
+    }
+
+    .contentTextBox {
+      width: 100%;
+      margin-top: 24rpx;
+      background: #fff;
+      border-radius: 8px;
+      box-sizing: border-box;
+      padding: 16px;
+    }
+
+    .contain {
+      width: 100%;
+      background: #fff;
+      border-radius: 8px;
+      box-sizing: border-box;
+      padding: 16px;
+      margin-top: 16px;
+      display: flex;
+      .img {
+        width: 32px;
+        height: 32px;
+      }
+      .text {
+        margin-left: 8px;
+        font-size: 14px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #160002;
+        line-height: 24px;
+        margin-bottom: 8px;
+      }
+      .strong {
+        font-size: 18px;
+        color: rgba(125, 86, 50, 1);
+        font-weight: 600;
+        margin: 0 4px;
+      }
+      .box {
+        width: 100%;
+        .store {
+          width: 100%;
+          display: flex;
+          margin-bottom: 10px;
+          .left {
+            width: 32px;
+            .img {
+              width: 20px;
+              height: 20px;
+              margin-top: 3px;
+            }
+          }
+          .right {
+            flex: 1;
+            width: 100%;
+            display: inline-block;
+            .top {
+              .storeText {
+                font-size: 14px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #160002;
+                line-height: 24px;
+                white-space: nowrap;
+              }
+              .storeTextRight {
+                font-size: 14px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #160002;
+                line-height: 24px;
+                width: 100%;
+                text-align: right;
+              }
+            }
+          }
+          .other {
+            font-size: 14px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #160002;
+            line-height: 24px;
+            display: inline-block;
+            width: 100%;
+            text-align: right;
+          }
+        }
+      }
+    }
+
+    .bottomBtn {
+      width: 100%;
+      box-sizing: border-box;
+      padding: 8px 0;
+      margin-top: 24rpx;
+      display: flex;
+      justify-content: space-between;
+      .btn {
+        // width: calc((100% - 32rpx) / 2);
+        width: 100%;
+        height: 41px;
+        background: rgba(125, 86, 50, 0.1);
+        border-radius: 4px;
+        font-size: 16px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #6d5f5e;
+        opacity: 0.6;
+      }
+      .change {
+        background: #7d5632;
+        color: #feffff;
+        opacity: 1;
+      }
+    }
+  }
+}
+</style>

pages/billOfLading/index.vue

@@ -0,0 +1,441 @@
+<template>
+  <view class="content">
+    <!-- 顶部筛选菜单 -->
+    <view class="uni-flex ai-center screen-box menu-list">
+      <view
+        class="menu"
+        v-for="(item, index) in menuList"
+        :key="index"
+        @click="handleClick(item)"
+      >
+        <view
+          class="menu-image round"
+          style="height: 75rpx; width: 75rpx; padding: 18rpx"
+          :style="
+            activeType == item.id
+              ? 'background:#f0f7fe;'
+              : 'background:#f6f7f8;'
+          "
+        >
+          <image
+            :src="activeType == item.id ? item.active : item.src"
+            mode="aspectFit"
+            style="height: 100%"
+          >
+          </image>
+        </view>
+        <view
+          class="menuName"
+          :style="activeType == item.id ? 'color:#5B96E9' : 'color:#808D97'"
+          >{{ item.name }}
+        </view>
+      </view>
+    </view>
+    <scroll-view
+      scroll-y
+      class="billList"
+      v-if="pageList && pageList.length > 0"
+      @scrolltolower="handleScrolltolower"
+    >
+      <!-- <list-unit
+        v-for="(item, index) in pageList"
+        :key="index"
+        :item="item"
+        :i="index"
+        @goDetail="goDetail"
+      ></list-unit> -->
+      <view
+        class="card"
+        v-for="(item, index) in pageList"
+        :key="index"
+        @click="handleGoDetail(item)"
+      >
+        <!-- 卡片第一行数据 -->
+        <view class="firstTitleBox">
+          <!-- 左侧 -->
+          <p class="contentName">{{ item.BusinessProcess_Name || "-" }}</p>
+        </view>
+        <!-- 卡片第一行角标 -->
+        <view class="content-index">{{ index + 1 }}</view>
+        <!-- 卡片第二行数据 -->
+        <view class="secondTitleBox">
+          <!-- 服务区名称 -->
+          <p class="content-type-text">{{ item.Serverpart_Name || "-" }}</p>
+        </view>
+        <!-- 卡片第三行数据  -->
+        <view
+          class="thirdTitleBox"
+          :style="{ color: item.BillState === 1 ? '' : 'red' }"
+        >
+          {{ item.BillState === 1 ? "已提单" : "未提单" }}
+        </view>
+        <!-- 第四行数据 -->
+        <view class="fourthTitleBox">
+          <view
+            class="leftContent"
+            :style="{ color: item.PaymentTerms === 1 ? 'red' : '' }"
+          >
+            {{
+              item.PaymentTerms === 1
+                ? "收款"
+                : item.PaymentTerms === 0
+                ? "退款"
+                : "-"
+            }}
+          </view>
+          <view class="rightContent">
+            {{
+              item.BusinessProcess_StartDate
+                ? $moment(item.BusinessProcess_StartDate).format("YYYY/MM/DD")
+                : ""
+            }}
+          </view>
+        </view>
+      </view>
+      <!-- 底部提示 -->
+      <view class="load-more" v-if="pageList.length > 0">
+        <text>{{
+          !pageMsg.isOver ? "正在加载,请稍后..." : "——— 我是有底线的 ———"
+        }}</text>
+      </view>
+    </scroll-view>
+    <!-- 无数据时的页面显示 -->
+    <view v-else>
+      <noFound
+        :nodata="pageList && pageList.length > 0 ? false : true"
+        :text="'暂无数据'"
+      >
+        <!-- <text name="other">请选择其它日期进行查询。</text> -->
+      </noFound>
+    </view>
+
+    <uni-popup
+      :show="showPop"
+      @hidePopup="closePop"
+      type="bottom"
+      @touchmove.prevent
+      round="true"
+    >
+      <view class="pop">
+        <p class="title">服务区名称</p>
+        <picker
+          class="title-clock"
+          mode="selector"
+          @change="pickerChange"
+          :value="pickerIndex"
+          range-key="label"
+          :range="severpartList"
+        >
+          <view class="box-center-title">{{
+            severpartList[pickerIndex].label
+          }}</view>
+        </picker>
+        <p class="title" style="margin-top: 20px">日期</p>
+        <view class="selectTime">
+          <picker
+            class="time"
+            mode="date"
+            @change="handlechangeTime($event, 0)"
+          >
+            <text>{{ "请选择开始时间" }}</text>
+          </picker>
+          -
+          <picker
+            class="time"
+            style="text-align: right"
+            mode="date"
+            @change="handlechangeTime($event, 1)"
+          >
+            <text>{{ "请选择结束时间" }}</text>
+          </picker>
+        </view>
+        <view class="popbtn" @click="reloadList">确定</view>
+      </view>
+    </uni-popup>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      pageMsg: {
+        pageSize: 10,
+        pageIndex: 1,
+        isOver: false,
+      }, // 列表查询条件
+      searchText: "", // 业务名称搜索
+      BillState: "", // 提单状态 1 已提单  0 未提单
+      pageList: [], // 数据值
+      activeType: 0, // 选择的提单
+      menuList: [
+        {
+          name: "全部",
+          src: "https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yifq.png",
+          active:
+            "https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yifqz.png",
+          id: 0,
+        },
+        {
+          name: "已提单",
+          src: "https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shenp.png",
+          active:
+            "https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shenpz.png",
+          id: 1,
+        },
+        {
+          name: "未提单",
+          src: "https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yichl.png",
+          active:
+            "https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yichlz.png",
+          id: 2,
+        },
+      ],
+      isFirst: true, // 是第一次
+    };
+  },
+  onLoad() {
+    //   请求列表数据
+    this.handleGetList();
+  },
+  onShow() {
+    if (!this.isFirst) {
+      this.handleGetList();
+    }
+    if (this.isFirst) {
+      this.isFirst = false;
+    }
+  },
+  methods: {
+    // 下拉到底部 触发的事件
+    handleScrolltolower() {
+      this.pageMsg.pageIndex = this.pageMsg.pageIndex + 1;
+      this.handleGetList();
+    },
+    //   请求列表数据
+    async handleGetList() {
+      const req = {
+        SearchParameter: {
+          BillState: this.BillState,
+          BusinessProcess_State: 9000,
+          Operation_Type: 11,
+          PendState: 3,
+        },
+        keyWord: this.searchText
+          ? { key: "BusinessProcess_Name", Value: this.searchText }
+          : "",
+        PageIndex: this.pageMsg.pageIndex,
+        PageSize: this.pageMsg.pageSize,
+      };
+      uni.showLoading({
+        title: "加载中...",
+      });
+      const data = await this.$request.$webPost(
+        "EShangApiMain/Finance/GetMonthAccountProinst",
+        req
+      );
+      console.log("list", data);
+      let list = data.Result_Data.List;
+      let oldList = [];
+      if (this.pageList && this.pageList.length > 0) {
+        oldList = this.pageList;
+      }
+      if (list && list.length > 0) {
+        list.forEach((item) => {
+          item.BusinessProcess_Name = item.BusinessProcess_Name.split("】")[1];
+        });
+
+        if (list.length < 10) {
+          this.pageMsg.isOver = true;
+        }
+      }
+      this.pageList = oldList.concat(list);
+      uni.hideLoading();
+    },
+    // 跳转去详情
+    handleGoDetail(obj) {
+      this.$util.toNextRoute(
+        "navigateTo",
+        `/pages/billOfLading/detail?id=${obj.BusinessApproval_ID}`
+      );
+    },
+    // 修改顶部的tab
+    handleClick(obj) {
+      this.activeType = obj.id;
+      this.BillState =
+        obj.id === 0 ? "" : obj.id === 1 ? 1 : obj.id === 2 ? "0" : "";
+      this.pageList = [];
+      this.pageMsg = {
+        pageSize: 10,
+        pageIndex: 1,
+        isOver: false,
+      };
+      this.handleGetList();
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.menu-list {
+  //顶部菜单样式
+  width: 100%;
+  background-color: #fff;
+  flex-wrap: wrap;
+}
+.menu {
+  text-align: center;
+  //   min-width: 185rpx;
+  width: calc(100% / 3);
+  padding: 24rpx 0;
+  box-sizing: border-box;
+}
+
+.round {
+  border-radius: 50%;
+}
+
+.menuName {
+  color: #120e2b;
+  font-size: 24rpx;
+  text-align: center;
+  margin-top: 16rpx;
+}
+
+.menu-image {
+  padding: 12rpx 8rpx;
+  height: 80rpx;
+  box-sizing: border-box;
+  margin: 0 auto;
+  text-align: center;
+}
+
+.menu-image image {
+  max-width: 100%;
+  max-height: 100%;
+}
+
+.screen-box {
+  background-color: #fff;
+  padding: 0 0rpx;
+  position: sticky;
+  top: 0;
+  z-index: 1;
+}
+.pop {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 16px;
+  text-align: left;
+}
+.pop .title {
+  font-size: 14px;
+  font-weight: 600;
+}
+.pop .title-clock {
+  display: inline-block;
+}
+.pop .selectTime {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.pop .selectTime .time {
+  width: 45%;
+}
+.pop .popbtn {
+  width: 639rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  color: #fff;
+  font-size: 28rpx;
+  background: #5b96e9;
+  border-radius: 8rpx;
+  margin: 48rpx auto 24rpx auto;
+  text-align: center;
+}
+
+.billList {
+  width: 100%;
+  height: calc(100vh - 100px);
+  box-sizing: border-box;
+  padding: 20rpx 24rpx;
+  .card {
+    width: 100%;
+    box-shadow: 0 0px 6rpx #e2e2e2;
+    box-sizing: border-box;
+    padding: 24rpx;
+    background: #fff;
+    position: relative;
+    margin-bottom: 24rpx;
+    .firstTitleBox {
+      width: 100%;
+      .contentName {
+        width: calc(100% - 48rpx);
+        font-size: 28rpx;
+        // height: 54rpx;
+        margin-left: 36rpx;
+        color: #333333;
+        display: -webkit-box;
+        -webkit-line-clamp: 2; /* 设置显示的行数 */
+        -webkit-box-orient: vertical;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+    }
+    .secondTitleBox {
+      .content-type-text {
+        color: #686868;
+        padding-left: 38rpx;
+        font-size: 22rpx;
+        line-height: 1.6;
+        max-width: 306rpx;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+      }
+    }
+    .thirdTitleBox {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-top: 12rpx;
+      font-size: 18px;
+      line-height: 50px;
+      margin: 0 4px;
+      border-bottom: 2rpx solid #eee;
+    }
+
+    .fourthTitleBox {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-top: 24rpx;
+      .leftContent {
+        color: #686868;
+        font-size: 24rpx;
+      }
+      .rightContent {
+        color: #686868;
+        font-size: 24rpx;
+      }
+    }
+    .content-index {
+      width: 42rpx;
+      height: 32rpx;
+      color: #fff;
+      background-color: #fb8b56;
+      position: absolute;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      position: absolute;
+      left: -4rpx;
+      top: 30rpx;
+      box-shadow: 4rpx 4rpx 2rpx 0 rgba(238, 112, 27, 0.5);
+    }
+  }
+}
+</style>

pages/earlyWarning/detail.vue

@@ -27,7 +27,7 @@
         <view class="detailFixed" :style="{top: menu.bottom + 12 +'px'}" v-if="showDetailFixed">
           <view class="itemDetail">
             <text :class="res.RevenueINC.increaseRate>0?'value red':res.RevenueINC.increaseRate<0?'value green':''">{{ res.RevenueINC.increaseRate?res.RevenueINC.increaseRate>0?`+${res.RevenueINC.increaseRate}%`:res.RevenueINC.increaseRate<0?`${res.RevenueINC.increaseRate}%`:'0':'-' }}</text>
-            <text class="label">销售明细</text>
+            <text class="label">对客营收</text>
           </view>
           <view class="itemDetail">
             <text :class="res.BayonetINC.increaseRate>0?'value red':res.BayonetINC.increaseRate<0?'value green':''">{{ res.BayonetINC.increaseRate?res.BayonetINC.increaseRate>0?`+${res.BayonetINC.increaseRate}%`:res.BayonetINC.increaseRate<0?`${res.BayonetINC.increaseRate}%`:'0':'-' }}</text>
@@ -41,7 +41,7 @@
               <image class="bg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/detailTopBg1.png"/>
               <view class="typeBoxTop" style="display: flex;justify-content: space-between;align-items: center">
                 <view>
-                  <text class="title">销售明细</text>
+                  <text class="title">对客营收</text>
                   <text class="unit">/万元</text>
                 </view>
                 <text class="monthText">{{date || ''}}</text>
@@ -112,7 +112,7 @@
               <text class="monthText">
                 {{selectType===1?`${res.ServerpartName}${date || ''}度车流`:selectType===2?`${res.ServerpartName}${date || ''}车流`:selectType===3?`${res.ServerpartName}${date || ''}车流`:selectType===4?`${res.ServerpartName}${date || ''}车流`:''}}
                 <text>{{res.BayonetINC.increaseRate>0?'增加':res.BayonetINC.increaseRate<0?'减少':''}}<text :style="{color:res.BayonetINC.increaseRate>0?'#E83944':res.BayonetINC.increaseRate<0?'#127E5B':''}">{{res.BayonetINC.increaseRate?`${Math.abs(res.BayonetINC.increaseRate)}%`:'-'}}</text></text>
-                {{selectType===1?'，销售明细':selectType===2?'，门店的营收减少':selectType===3?'，销售明细':selectType===4?'，销售明细':''}}
+                {{selectType===1?'，对客营收':selectType===2?'，门店的营收减少':selectType===3?'，对客营收':selectType===4?'，对客营收':''}}
                 <text v-if="selectType!==2">{{res.RevenueINC.increaseRate>0?'增加':res.RevenueINC.increaseRate<0?'减少':''}}<text :style="{color:res.RevenueINC.increaseRate>0?'#E83944':res.RevenueINC.increaseRate<0?'#127E5B':''}">{{res.RevenueINC.increaseRate?`${Math.abs(res.RevenueINC.increaseRate)}%`:'-'}}</text></text>
               </text>
 

pages/earlyWarning/index.vue

@@ -154,7 +154,7 @@
           </view>
 
           <view class="sortItem" style="width: 25%;justify-content: flex-end"  @click="handleChangeSortName(1)">
-            <text class="sortName">销售明细</text>
+            <text class="sortName">对客营收</text>
             <view class="sortIconBox">
               <image class="upIcon" :style="{transform: sortName===1?sortType===1?``:`rotate(180deg)`:``}" :src="sortType===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg':sortName===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
               <image class="bottomIcon" :style="{transform: sortName===1?sortType===1?``:`rotate(180deg)`:'rotate(-180deg)'}":src="sortType===1 && sortName===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
@@ -196,7 +196,7 @@
                 </view>
                 <view class="secondItemTop">
                   <view>
-                    <text class="itemTopName">销售明细</text>
+                    <text class="itemTopName">对客营收</text>
                     <text class="itemTopUnit">/万元</text>
                   </view>
                   <image v-if="false" class="addReduce" :src="Number(item.RevenueINC.increaseRate)>0?'https://eshangtech.com/ShopICO/ahyd-BID/examine/add.svg':Number(item.RevenueINC.increaseRate)<0?'https://eshangtech.com/ShopICO/ahyd-BID/examine/reduce.svg':''"/>

pages/expenseApproval/expenseApproval.vue

@@ -136,7 +136,7 @@
 							{
 								name:'借款单申请',
 								typeId: "401601",
-								src: '../../../../../static/images/expense/type/jkdsp.png',
+								src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/jkdsp.png',
 							},{
 								name: '服务区报销',
 								typeId: "401602",
@@ -148,11 +148,11 @@
 							},{
 								name:'保证金退付',
 								typeId: "401604",
-								src: '../../../../../static/images/expense/type/bzjtf.png',
+								src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/bzjtf.png',
 							},{
 								name:'工程结算单',
 								typeId: "401605",
-								src: '../../../../../static/images/expense/type/gcjsd.png',
+								src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/gcjsd.png',
 							}
 						]
 					}
@@ -175,7 +175,7 @@
 						,{
 							name:'行政资产申请',
 							typeId: "401101",
-							src: '../../../../../static/images/expense/type/xzzcsp.png',
+							src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/xzzcsp.png',
 						}
 						,{
 							name: '公务交通',
@@ -195,7 +195,7 @@
 						,{
 							name:'工程款支付',
 							typeId: "401203",
-							src: '../../../../../static/images/expense/type/gcjsd.png',
+							src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/gcjsd.png',
 						}
 						,{
 							name:'经费预算',
@@ -210,11 +210,11 @@
 						,{
 							name:'内部转账',
 							typeId: "401301",
-							src: '../../../../../static/images/expense/type/bzjtf.png',
+							src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/bzjtf.png',
 						}
 						,{
 							name:'大额支付',
-							src: '../../../../../static/images/expense/type/dezf.png',
+							src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/dezf.png',
 							typeId: "401302"
 						}
 						,{
@@ -225,7 +225,7 @@
 						,{
 							name:'领付款申请',
 							typeId:"401304",
-							src: '../../../../../static/images/expense/type/jkdsp.png',
+							src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/jkdsp.png',
 						},
 
 					]

pages/investment/investmentDetail.vue

@@ -332,7 +332,7 @@
 		background-image: url('/static/images/investment/wz.png');
 	}
 	.ico-jyqk:before {
-		background-image: url('/static/images/investment/jyqk.png')
+		background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/investment/jyqk.png')
 	}
 
 	.ico-htlx:before {

pages/officialDocManagement/components/listUnit.vue

@@ -5,7 +5,7 @@
 			<text class="typeText" :class="item.ISREAD=='1' ? 'typeText-color' : ''">{{item.ISREAD==0 ? '待我查阅': '已查阅'}}</text>
 		</div>
 		<view class="title-ico ">
-			<image src="../../../static/images/reader/recive-read.png" mode="aspectFit"></image>
+			<image src="https://eshangtech.com/ShopICO/ahyd-BID/reader/recive-read.png" mode="aspectFit"></image>
 		</view>
 		<view class="uni-flex plr32 " style="" v-show="type==0">
 			<text class="text-gray fs26">发文人员：</text>

pages/operatingStatements/detail.vue

@@ -125,7 +125,7 @@ import request from '@/util/index.js'
           endTime: obj.et,
           serverpartId: obj.id,
           provinceCode: obj.pcode,
-          BusinessTrade: obj.BusinessTrade,
+          BusinessTrade: obj.BusinessTrade || '',
           SearchKeyName:_this.pageOption.searchKey,
           SearchKeyValue:_this.pageOption.searchValue,
           BusinessType:_this.pageOption.BusinessTypeValue>0?_this.pageOption.BusinessTypeValue:'',

pages/projectWarning/detail.vue

@@ -1,265 +1,393 @@
 <template>
-    <view class="page-body" >
+  <view class="page-body">
-<!--      <image class="bg" src="https://eshangtech.com/ShopICO/yxcl/projectWarning/bg.svg"></image>-->
+    <!--      <image class="bg" src="https://eshangtech.com/ShopICO/yxcl/projectWarning/bg.svg"></image>-->
-      <view class="header" :style="{height: menu.bottom  + 'px' }">
+    <view class="header" :style="{ height: menu.bottom + 'px' }">
-        <image @click="handleBack" class="allowLeft" :style="{top: menu.top +((menu.height - 24) / 2) + 'px'}" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg"></image>
+      <image
+        @click="handleBack"
+        class="allowLeft"
+        :style="{ top: menu.top + (menu.height - 24) / 2 + 'px' }"
+        src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg"
+      ></image>
+    </view>
+    <p class="title">分润比例切换</p>
+    <view class="main">
+      <view class="detail">
+        <view class="type">{{
+          dataDetail.BUSINESS_TYPE === 1000
+            ? "合作经营"
+            : dataDetail.BUSINESS_TYPE === 2000
+            ? "固定租金"
+            : ""
+        }}</view>
+        <view class="top">
+          <view class="left">
+            <image
+              class="logo"
+              :src="
+                dataDetail.BUSINESSPROJECT_ICO
+                  ? dataDetail.BUSINESSPROJECT_ICO
+                  : 'https://eshangtech.com/ShopICO/yxcl/projectWarning/defaultImg.svg'
+              "
+            ></image>
+          </view>
+          <view class="right">
+            <p class="detailTitle">{{ dataDetail.SERVERPARTSHOP_NAME }}</p>
+            <view class="fixed">
+              <image
+                class="serviceFixed"
+                src="https://eshangtech.com/ShopICO/yxcl/projectWarning/position.svg"
+              ></image>
+              <span class="service">{{ dataDetail.SERVERPART_NAME }}</span>
+            </view>
+            <view class="other">
+              <view class="item">
+                <image
+                  class="icon"
+                  src="https://eshangtech.com/ShopICO/yxcl/projectWarning/user.svg"
+                ></image>
+                <span class="value">{{
+                  dataDetail.COOPMERCHANTS_LINKMAN || "-"
+                }}</span>
+              </view>
+              <view class="item">
+                <image
+                  class="icon"
+                  src="https://eshangtech.com/ShopICO/yxcl/projectWarning/phone.svg"
+                ></image>
+                <span class="value">{{
+                  dataDetail.COOPMERCHANTS_MOBILEPHONE || "-"
+                }}</span>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="bottom">
+          <view class="message">
+            <image
+              class="icon"
+              src="https://eshangtech.com/ShopICO/yxcl/projectWarning/money.svg"
+            ></image>
+            <span class="text">保底租金</span>
+            <span class="money">{{ dataDetail.MINTURNOVER || "-" }}</span>
+          </view>
+          <view class="message">
+            <image
+              class="icon"
+              src="https://eshangtech.com/ShopICO/yxcl/projectWarning/date.svg"
+            ></image>
+            <span class="text">本期结算</span>
+            <span class="money"
+              >{{ dataDetail.STARTDATE || "-" }} -
+              {{ dataDetail.ENDDATE || "-" }}</span
+            >
+          </view>
+          <view class="message" style="margin-bottom: 0">
+            <image
+              class="icon"
+              src="https://eshangtech.com/ShopICO/yxcl/projectWarning/date.svg"
+            ></image>
+            <span class="text">合同期限</span>
+            <span class="money"
+              >{{ dataDetail.COMPACT_STARTDATE || "-" }} -
+              {{ dataDetail.COMPACT_ENDDATE || "-" }}</span
+            >
+          </view>
+        </view>
       </view>
-      <p class="title">分润比例切换</p>
+
-      <view class="main">
+      <view class="contain">
-        <view class="detail">
+        <image
-          <view class="type">{{dataDetail.BUSINESS_TYPE===1000?'合作经营':dataDetail.BUSINESS_TYPE===2000?'固定租金':''}}</view>
+          class="img"
-          <view class="top">
+          style="width: 32px; height: 32px"
+          src="https://eshangtech.com/ShopICO/yxcl/projectWarning/question.svg"
+        ></image>
+        <view>
+          <view class="text">
+            本项目驿达累计分润已达<span class="strong"
+              ><span clsas="strong" style="font-size: 14px">￥</span
+              >{{ dataDetail.ROYALTY_PRICE || "-" }}</span
+            >,<br />
+            <span v-if="dataDetail.EXPENSE_AMOUNT"
+              >其中已扣减水电物业费
+              <span class="strong"
+                ><span clsas="strong" style="font-size: 14px">￥</span
+                >{{ $util.fmoney(dataDetail.EXPENSE_AMOUNT) }}</span
+              >, </span
+            ><br />
+            <span v-if="dataDetail.EXPIREDAYS !== 0"
+              >预计<span class="strong">{{ dataDetail.EXPIREDAYS || "-" }}</span
+              >后完成</span
+            >
+            <span v-if="dataDetail.EXPIREDAYS === 0" class="strong">已完成</span
+            >保底！
+          </view>
+          <view
+            class="text"
+            :style="{
+              marginBottom:
+                dataDetail.PROJECTWARNING_STATE === 2000 ? '8px' : '0px',
+            }"
+          >
+            <span v-if="dataDetail.PROJECTWARNING_STATE === 9000"
+              >{{ dataDetail.PROJECTWARNING_DESC }}：</span
+            >
+            <span v-else>是否依合同将分润比例进行切换：</span><br />
+            驿达<span class="strong">{{ YDValue || "-" }}%</span>, 商家<span
+              class="strong"
+              >{{ SJValue || "-" }}%</span
+            >
+            <span
+              v-if="
+                dataDetail.PROJECTWARNING_STATE > 0 &&
+                dataDetail.PROJECTWARNING_STATE < 9000
+              "
+              >？</span
+            >
+          </view>
+          <view
+            v-if="
+              dataDetail.PROJECTWARNING_STATE > 0 &&
+              dataDetail.PROJECTWARNING_STATE < 9000
+            "
+            class="text"
+            style="margin-top: 8px"
+            :style="{
+              marginBottom:
+                dataDetail.PROJECTWARNING_STATE === 2000 ? '8px' : '0px',
+            }"
+          >
+            <span
+              >{{ `切换日期默认设定：`
+              }}<span class="strong">{{ configTime }}</span></span
+            >
+          </view>
+        </view>
+      </view>
+      <view class="contain" v-if="storeList.length && storeList.length > 0">
+        <view class="box">
+          <view
+            class="store"
+            v-for="(item, index) in storeList"
+            :key="index"
+            :style="{
+              marginBottom: index + 1 === storeList.length ? '0px' : '10px',
+            }"
+          >
             <view class="left">
-              <image class="logo" :src="dataDetail.BUSINESSPROJECT_ICO?dataDetail.BUSINESSPROJECT_ICO:'https://eshangtech.com/ShopICO/yxcl/projectWarning/defaultImg.svg'"></image>
+              <image
+                class="img"
+                :src="
+                  item.APPROVED_TYPE !== 9999
+                    ? '/static/images/right-ico.png'
+                    : '/static/images/wrong-ico.png'
+                "
+              ></image>
             </view>
             <view class="right">
-              <p class="detailTitle">{{dataDetail.SERVERPARTSHOP_NAME}}</p>
+              <view class="top">
-              <view class="fixed" >
+                <p class="storeText">【{{ item.APPROVED_NAME }}】</p>
-                <image class="serviceFixed" src="https://eshangtech.com/ShopICO/yxcl/projectWarning/position.svg"></image>
+                <p class="storeText">
-                <span class="service">{{dataDetail.SERVERPART_NAME}}</span>
+                  {{ item.APPROVED_STAFF }}：{{ item.APPROVED_INFO }}
+                </p>
               </view>
-              <view class="other">
+              <span class="other">{{ item.APPROVED_DATE }}</span>
-                <view class="item">
-                  <image class="icon" src="https://eshangtech.com/ShopICO/yxcl/projectWarning/user.svg"></image>
-                  <span class="value">{{dataDetail.COOPMERCHANTS_LINKMAN || '-'}}</span>
-                </view>
-                <view class="item">
-                  <image class="icon" src="https://eshangtech.com/ShopICO/yxcl/projectWarning/phone.svg"></image>
-                  <span class="value">{{dataDetail.COOPMERCHANTS_MOBILEPHONE || '-'}}</span>
-                </view>
-              </view>
-            </view>
-          </view>
-          <view class="bottom">
-            <view class="message">
-              <image class="icon" src="https://eshangtech.com/ShopICO/yxcl/projectWarning/money.svg"></image>
-              <span class="text">保底租金</span>
-              <span class="money">{{dataDetail.MINTURNOVER || '-'}}</span>
-            </view>
-            <view class="message" >
-              <image class="icon" src="https://eshangtech.com/ShopICO/yxcl/projectWarning/date.svg"></image>
-              <span class="text">本期结算</span>
-              <span class="money">{{dataDetail.STARTDATE || '-'}} - {{dataDetail.ENDDATE || '-'}}</span>
-            </view>
-            <view class="message" style="margin-bottom: 0">
-              <image class="icon" src="https://eshangtech.com/ShopICO/yxcl/projectWarning/date.svg"></image>
-              <span class="text">合同期限</span>
-              <span class="money">{{dataDetail.COMPACT_STARTDATE || '-'}} - {{dataDetail.COMPACT_ENDDATE || '-'}}</span>
             </view>
           </view>
         </view>
-
-        <view class="contain">
-          <image class="img" style="width: 32px;height: 32px" src="https://eshangtech.com/ShopICO/yxcl/projectWarning/question.svg"></image>
-          <view>
-            <view class="text">
-              本项目驿达累计分润已达<span class="strong"><span clsas="strong" style="font-size: 14px">￥</span>{{ dataDetail.ROYALTY_PRICE|| '-' }}</span>,<br/>
-              <span v-if="dataDetail.EXPENSE_AMOUNT">其中已扣减水电物业费
-                <span class="strong"><span clsas="strong" style="font-size: 14px">￥</span>{{$util.fmoney(dataDetail.EXPENSE_AMOUNT)}}</span>,
-              </span><br/>
-              <span v-if="dataDetail.EXPIREDAYS!==0">预计<span class="strong">{{ dataDetail.EXPIREDAYS|| '-' }}</span>后完成</span>
-              <span v-if="dataDetail.EXPIREDAYS===0" class="strong">已完成</span>保底！
-            </view>
-            <view class="text" :style="{marginBottom: dataDetail.PROJECTWARNING_STATE===2000?'8px':'0px'}">
-			  <span v-if="dataDetail.PROJECTWARNING_STATE===9000">{{dataDetail.PROJECTWARNING_DESC}}：</span>
-			  <span v-else>是否依合同将分润比例进行切换：</span><br/>
-              驿达<span class="strong">{{YDValue|| '-'}}%</span>,
-              商家<span class="strong">{{SJValue|| '-'}}%</span>
-			  <span v-if="dataDetail.PROJECTWARNING_STATE>0&&dataDetail.PROJECTWARNING_STATE<9000">？</span>
-            </view>
-            <view v-if='dataDetail.PROJECTWARNING_STATE>0 && dataDetail.PROJECTWARNING_STATE<9000' class="text" style="margin-top: 8px" :style="{marginBottom: dataDetail.PROJECTWARNING_STATE===2000?'8px':'0px'}">
-              <span>{{ `切换日期默认设定：` }}<span class="strong">{{configTime}}</span></span>
-            </view>
-          </view>
-        </view>
-        <view class="contain" v-if="storeList.length && storeList.length>0">
-          <view class="box">
-            <view class="store"  v-for="(item,index) in storeList" :key="index" :style="{marginBottom:index + 1 === storeList.length?'0px':'10px'}">
-              <view class="left">
-                <image class="img" :src="item.APPROVED_TYPE!==9999?'/static/images/right-ico.png':'/static/images/wrong-ico.png'"></image>
-              </view>
-              <view class="right">
-                <view class="top">
-                  <p class="storeText">【{{item.APPROVED_NAME}}】</p>
-                  <p class="storeText">{{item.APPROVED_STAFF}}：{{item.APPROVED_INFO}}</p>
-                </view>
-                <span class="other">{{item.APPROVED_DATE}}</span>
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view class="bottomBtn" v-if="dataDetail.DealMark===0">
-        <button class="btn change" @click="handleChange">切换比例</button>
-        <button class="btn" @click="handleNoChange">暂不切换</button>
       </view>
     </view>
+    <view class="bottomBtn" v-if="dataDetail.DealMark === 0">
+      <button class="btn change" @click="handleChange">切换比例</button>
+      <button class="btn" @click="handleNoChange">暂不切换</button>
+    </view>
+  </view>
 </template>
 <script>
 import Store from "../../store/store";
 
 export default {
-    data() {
+  data() {
-        return {
+    return {
-          PROJECTWARNING_ID:'',
+      PROJECTWARNING_ID: "",
-          dataDetail:{},
+      dataDetail: {},
-          inputValue:'',// 分润比例的输入框
+      inputValue: "", // 分润比例的输入框
-          useDate:{},
+      useDate: {},
-          YDValue:'',// 驿达的值
+      YDValue: "", // 驿达的值
-          SJValue:'',// 商家的值
+      SJValue: "", // 商家的值
-          statusBarHeight:'',
+      statusBarHeight: "",
-          menu:'',
+      menu: "",
-          time:'',// 详情给的备注的时间
+      time: "", // 详情给的备注的时间
-          desc:[],// 详情给的备注
+      desc: [], // 详情给的备注
-          type:true,// 是否从推送进
+      type: true, // 是否从推送进
-          storeList:[],// 记录列表
+      storeList: [], // 记录列表
-          configTime:''
+      configTime: "",
-        }
+    };
-    },
+  },
-    onLoad(query){
+  onLoad(query) {
-      //  获取手机参数对页面进行适配
+    //  获取手机参数对页面进行适配
-      let systemInfo = uni.getSystemInfoSync()
+    let systemInfo = uni.getSystemInfoSync();
-      this.statusBarHeight = Number(systemInfo.statusBarHeight)
+    this.statusBarHeight = Number(systemInfo.statusBarHeight);
-      this.menu = uni.getMenuButtonBoundingClientRect()
+    this.menu = uni.getMenuButtonBoundingClientRect();
-      this.PROJECTWARNING_ID = query.id
+    this.PROJECTWARNING_ID = query.id;
-      this.handleGetDetail()
+    this.handleGetDetail();
-      this.useDate = Store.state.userData
+    this.useDate = Store.state.userData;
-      if (query.type==='no'){
+    if (query.type === "no") {
-        this.type = false
+      this.type = false;
-      }
+    }
-      this.handleStore()
+    this.handleStore();
-      const date= new Date()
+    const date = new Date();
-      let m = date.getMonth() + 1
+    let m = date.getMonth() + 1;
-      if (m === 12){
+    if (m === 12) {
-        m = 1
+      m = 1;
-      }else{
+    } else {
-        m  = m + 1
+      m = m + 1;
-      }
+    }
-      this.configTime = `${m}月1日0点`
+    this.configTime = `${m}月1日0点`;
-    },
+  },
   //页面关闭
   onUnload() {
     // 记录用户行为
-    this.$util.addUserBehavior()
+    this.$util.addUserBehavior();
   },
-    methods:{
+  methods: {
-        // 拿到详细数据
+    // 拿到详细数据
-        handleGetDetail(){
+    handleGetDetail() {
-          uni.showLoading({
+      uni.showLoading({
-            title:'正在加载'
+        title: "正在加载",
-          })
+      });
-            this.$request.$webGet('EShangApiMain/BusinessProject/GetPROJECTWARNINGDetail',{
+      this.$request
-                PROJECTWARNINGId:this.PROJECTWARNING_ID
+        .$webGet("EShangApiMain/BusinessProject/GetPROJECTWARNINGDetail", {
-            }).then(res=>{
+          PROJECTWARNINGId: this.PROJECTWARNING_ID,
-                uni.hideLoading()
+        })
-                this.dataDetail = res.Result_Data
+        .then((res) => {
-                // 金额加上千分号
+          uni.hideLoading();
-                for (let key in this.dataDetail){
+          this.dataDetail = res.Result_Data;
-                    if (key==='REVENUEDAILY_AMOUNT' || key==='REVENUE_AMOUNT' || key==='ROYALTY_PRICE' || key==='SUBROYALTY_PRICE' || key==='TICKET_FEE' || key==='MINTURNOVER'){
+          // 金额加上千分号
-                        this.dataDetail[key] = this.$util.fmoney(this.dataDetail[key])
+          for (let key in this.dataDetail) {
-                    }
+            if (
-                }
+              key === "REVENUEDAILY_AMOUNT" ||
-                this.YDValue = this.dataDetail.MerchantRatio.split(':')[0]
+              key === "REVENUE_AMOUNT" ||
-                this.SJValue = this.dataDetail.MerchantRatio.split(':')[1]
+              key === "ROYALTY_PRICE" ||
-              if (this.dataDetail.PROJECTWARNING_DESC){
+              key === "SUBROYALTY_PRICE" ||
-                this.time = this.dataDetail.PROJECTWARNING_DESC.split('【')[1].split('】')[0]
+              key === "TICKET_FEE" ||
-                this.desc[0] = this.dataDetail.PROJECTWARNING_DESC.split('【')[0]
+              key === "MINTURNOVER"
-                this.desc[1] = this.dataDetail.PROJECTWARNING_DESC.split('【')[1].split('，')[1]
+            ) {
-              }
+              this.dataDetail[key] = this.$util.fmoney(this.dataDetail[key]);
-            })
-        },
-        handleStore(){
-          this.$request.$webPost('EShangApiMain/BusinessProject/GetAPPROVEDList',{
-            SearchParameter:{
-              TABLE_ID: this.PROJECTWARNING_ID,
-              TABLE_NAME: "T_PROJECTWARNING"
-            },
-            PageIndex: 1,
-            PageSiz: 99,
-            SortStr: "APPROVED_DATE desc"
-          }).then(res=>{
-            this.storeList = res.Result_Data.List
-          })
-        },
-        // 暂不切换比例
-        handleNoChange(){
-          let _this = this
-          uni.showModal({
-            title: '是否暂不切换分润比例？',
-            success: function (res) {
-              if (res.confirm) {
-                uni.showLoading({
-                  title:'正在加载'
-                })
-                _this.$request.$webGet('EShangApiMain/BusinessProject/ApproveProinst',{
-                  BusinessId: _this.PROJECTWARNING_ID, // 预警记录内码
-                  StaffId:_this.useDate.UserId,// 操作人内码
-                  StaffName:_this.useDate.UserName,// 操作人名称
-                  SwitchRate:_this.dataDetail.ROYALTY_RATE * 100,// 切换比例
-                  ApproveState:'9999',// 审批状态
-                }).then(res=>{
-                  uni.hideLoading()
-                  uni.showToast({
-                    title: res.Result_Desc,
-                    icon: 'none'
-                  })
-                  _this.handleGetDetail()
-                  uni.navigateBack({
-                    delta: 1
-                  })
-                })
-              }
             }
-          });
-        },
-        // 切换比例
-        handleChange(){
-          let _this = this
-          uni.showModal({
-            title: '是否切换分润比例？',
-            success: function (res) {
-              if (res.confirm) {
-                uni.showLoading({
-                  title:'正在加载'
-                })
-                _this.$request.$webGet('EShangApiMain/BusinessProject/ApproveProinst',{
-                  BusinessId: _this.PROJECTWARNING_ID, // 预警记录内码
-                  StaffId:_this.useDate.UserId,// 操作人内码
-                  StaffName:_this.useDate.UserName,// 操作人名称
-                  SwitchRate:_this.dataDetail.ROYALTY_CRATE,// 切换比例
-                  ApproveState:_this.dataDetail.PROJECTWARNING_STATE===1000?'2000':'9000',// 审批状态
-                }).then(res=>{
-                  uni.hideLoading()
-                  if (_this.dataDetail.PROJECTWARNING_STATE===1000){
-                    _this.handleBack()
-                  }
-                  uni.showToast({
-                    title: res.Result_Desc,
-                    icon: 'none'
-                  })
-                  _this.handleGetDetail()
-                })
-              }
-            }
-          });
-        },
-      handleBack(){
-          if (this.type){
-            uni.redirectTo({
-              url: '/pages/projectWarning/index'
-            });
-          }else{
-            uni.navigateBack({
-              delta:1
-            });
           }
+          this.YDValue = this.dataDetail.MerchantRatio.split(":")[0];
+          this.SJValue = this.dataDetail.MerchantRatio.split(":")[1];
+          if (this.dataDetail.PROJECTWARNING_DESC) {
+            this.time =
+              this.dataDetail.PROJECTWARNING_DESC.split("【")[1].split("】")[0];
+            this.desc[0] = this.dataDetail.PROJECTWARNING_DESC.split("【")[0];
+            this.desc[1] =
+              this.dataDetail.PROJECTWARNING_DESC.split("【")[1].split("，")[1];
+          }
+        });
+    },
+    handleStore() {
+      this.$request
+        .$webPost("EShangApiMain/BusinessProject/GetAPPROVEDList", {
+          SearchParameter: {
+            TABLE_ID: this.PROJECTWARNING_ID,
+            TABLE_NAME: "T_PROJECTWARNING",
+          },
+          PageIndex: 1,
+          PageSiz: 99,
+          SortStr: "APPROVED_DATE desc",
+        })
+        .then((res) => {
+          this.storeList = res.Result_Data.List;
+          console.log("this.storeList", this.storeList);
+        });
+    },
+    // 暂不切换比例
+    handleNoChange() {
+      let _this = this;
+      uni.showModal({
+        title: "是否暂不切换分润比例？",
+        success: function (res) {
+          if (res.confirm) {
+            uni.showLoading({
+              title: "正在加载",
+            });
+            _this.$request
+              .$webGet("EShangApiMain/BusinessProject/ApproveProinst", {
+                BusinessId: _this.PROJECTWARNING_ID, // 预警记录内码
+                StaffId: _this.useDate.UserId, // 操作人内码
+                StaffName: _this.useDate.UserName, // 操作人名称
+                SwitchRate: _this.dataDetail.ROYALTY_RATE * 100, // 切换比例
+                ApproveState: "9999", // 审批状态
+              })
+              .then((res) => {
+                uni.hideLoading();
+                uni.showToast({
+                  title: res.Result_Desc,
+                  icon: "none",
+                });
+                _this.handleGetDetail();
+                uni.navigateBack({
+                  delta: 1,
+                });
+              });
+          }
+        },
+      });
+    },
+    // 切换比例
+    handleChange() {
+      let _this = this;
+      uni.showModal({
+        title: "是否切换分润比例？",
+        success: function (res) {
+          if (res.confirm) {
+            uni.showLoading({
+              title: "正在加载",
+            });
+            _this.$request
+              .$webGet("EShangApiMain/BusinessProject/ApproveProinst", {
+                BusinessId: _this.PROJECTWARNING_ID, // 预警记录内码
+                StaffId: _this.useDate.UserId, // 操作人内码
+                StaffName: _this.useDate.UserName, // 操作人名称
+                SwitchRate: _this.dataDetail.ROYALTY_CRATE, // 切换比例
+                ApproveState:
+                  _this.dataDetail.PROJECTWARNING_STATE === 1000
+                    ? "2000"
+                    : "9000", // 审批状态
+              })
+              .then((res) => {
+                uni.hideLoading();
+                if (_this.dataDetail.PROJECTWARNING_STATE === 1000) {
+                  _this.handleBack();
+                }
+                uni.showToast({
+                  title: res.Result_Desc,
+                  icon: "none",
+                });
+                _this.handleGetDetail();
+              });
+          }
+        },
+      });
+    },
+    handleBack() {
+      if (this.type) {
+        uni.redirectTo({
+          url: "/pages/projectWarning/index",
+        });
+      } else {
+        uni.navigateBack({
+          delta: 1,
+        });
       }
-    }
+    },
-}
+  },
+};
 </script>
 
 <style scoped lang="scss">
-@import '/static/public/font/stylesheet.css';
+@import "/static/public/font/stylesheet.css";
 .page-body {
   width: 100vw;
   min-height: 100vh;
@@ -274,75 +402,87 @@ export default {
   //  top: 0;left: 0;
   //  z-index: 1;
   //}
-  .header{
+  .header {
     width: 100%;
     box-sizing: border-box;
     padding: 0 16px;
     position: relative;
     margin-top: 0;
-    z-index:222;
+    z-index: 222;
-    .allowLeft{
+    .allowLeft {
       position: absolute;
       width: 24px;
       height: 24px;
       left: 16px;
     }
   }
-  .title{
+  .title {
     font-size: 28px;
     font-family: Alimama ShuHeiTi;
     color: #160002;
     line-height: 39px;
     margin: 18px 0 16px 16px;
-    background: linear-gradient(180deg, #C25E18 30%, #8C4917 100%);
+    background: linear-gradient(180deg, #c25e18 30%, #8c4917 100%);
     -webkit-background-clip: text;
     -webkit-text-fill-color: transparent;
   }
-  .main{
+  .main {
     width: 100%;
     box-sizing: border-box;
     padding: 0 16px 95px;
-    .detail{
+    .detail {
       width: 100%;
       box-sizing: border-box;
-      background: linear-gradient(314deg, #FFFCF3 0%, #FFF0E6 20%, #FFF9F5 51%, #FFF8E7 73%, #FFF6EE 100%);
+      background: linear-gradient(
+        314deg,
+        #fffcf3 0%,
+        #fff0e6 20%,
+        #fff9f5 51%,
+        #fff8e7 73%,
+        #fff6ee 100%
+      );
       border-radius: 8px;
       padding: 16px;
       position: relative;
-      .type{
+      .type {
         position: absolute;
         right: 0;
         top: 16px;
-        background: linear-gradient(270deg, #F8D792 0%, #FFE6B2 50%, #FBC13B 100%);
+        background: linear-gradient(
+          270deg,
+          #f8d792 0%,
+          #ffe6b2 50%,
+          #fbc13b 100%
+        );
         border-radius: 10px 0 0 2px;
-        padding:2px 8px;
+        padding: 2px 8px;
         font-size: 14px;
         font-family: PingFangSC-Regular;
         font-weight: 400;
         color: #604128;
         line-height: 20px;
       }
-      .top{
+      .top {
         width: 100%;
         height: 168rpx;
         display: flex;
-        .left{
+        .left {
           width: 168rpx;
           height: 168rpx;
           margin-right: 12px;
           border-radius: 8px;
           overflow: hidden;
-          .logo{
+          .logo {
             width: 168rpx;
             height: 168rpx;
           }
         }
-        .right{
+        .right {
           //display: flex;
           //flex-direction: column;
           //justify-content: space-between;
           //align-items: flex-start;
-          .detailTitle{
+          .detailTitle {
             font-size: 36rpx;
             font-family: PingFangSC-Semibold, PingFang SC;
             font-weight: 600;
@@ -350,7 +490,7 @@ export default {
             margin-bottom: 12rpx;
             line-height: 56rpx;
           }
-          .fixed{
+          .fixed {
             height: 24px;
             line-height: 24px;
             padding: 1px 4px;
@@ -359,34 +499,34 @@ export default {
             border-radius: 4px;
             display: inline-block;
             margin-bottom: 12rpx;
-            .serviceFixed{
+            .serviceFixed {
               width: 20rpx;
               height: 24rpx;
               margin-right: 8rpx;
               line-height: 24px;
             }
-            .service{
+            .service {
               font-size: 28rpx;
               font-family: PingFangSC-Semibold, PingFang SC;
               font-weight: 600;
-              color: #6C492A;
+              color: #6c492a;
               line-height: 40rpx;
             }
           }
-          .other{
+          .other {
             width: 100%;
             display: flex;
             align-items: center;
-            .item{
+            .item {
               display: flex;
               align-items: center;
               margin-right: 16px;
-              .icon{
+              .icon {
                 width: 16px;
                 height: 16px;
                 margin-right: 6px;
               }
-              .value{
+              .value {
                 font-size: 28rpx;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;
@@ -398,38 +538,38 @@ export default {
           }
         }
       }
-      .bottom{
+      .bottom {
         margin-top: 24px;
-        .message{
+        .message {
           width: 100%;
           display: flex;
           align-items: center;
           margin-bottom: 8px;
-          .icon{
+          .icon {
             width: 16px;
             height: 16px;
             margin-right: 8px;
           }
-          .text{
+          .text {
             font-size: 14px;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
-            color: #786B6C;
+            color: #786b6c;
             line-height: 20px;
             margin-right: 8px;
           }
-          .money{
+          .money {
             font-size: 14px;
             font-family: PingFangSC-Semibold, PingFang SC;
             font-weight: 600;
-            color: #7D5632;
+            color: #7d5632;
             line-height: 20px;
           }
         }
       }
     }
   }
-  .contain{
+  .contain {
     width: 100%;
     background: #fff;
     border-radius: 8px;
@@ -437,11 +577,11 @@ export default {
     padding: 16px;
     margin-top: 16px;
     display: flex;
-    .img{
+    .img {
       width: 32px;
       height: 32px;
     }
-    .text{
+    .text {
       margin-left: 8px;
       font-size: 14px;
       font-family: PingFangSC-Regular, PingFang SC;
@@ -450,34 +590,34 @@ export default {
       line-height: 24px;
       margin-bottom: 8px;
     }
-    .strong{
+    .strong {
       font-size: 18px;
       color: rgba(125, 86, 50, 1);
       font-weight: 600;
       margin: 0 4px;
     }
-    .box{
+    .box {
       width: 100%;
-      .store{
+      .store {
         width: 100%;
         display: flex;
         margin-bottom: 10px;
-        .left{
+        .left {
           width: 32px;
-          .img{
+          .img {
             width: 20px;
             height: 20px;
             margin-top: 3px;
           }
         }
-        .right{
+        .right {
           flex: 1;
           width: 100%;
           display: inline-block;
-          .top{
+          .top {
             display: flex;
             justify-content: space-between;
-            .storeText{
+            .storeText {
               font-size: 14px;
               font-family: PingFangSC-Regular, PingFang SC;
               font-weight: 400;
@@ -487,7 +627,7 @@ export default {
             }
           }
         }
-        .other{
+        .other {
           font-size: 14px;
           font-family: PingFangSC-Regular, PingFang SC;
           font-weight: 400;
@@ -500,7 +640,7 @@ export default {
       }
     }
   }
-  .bottomBtn{
+  .bottomBtn {
     width: 100%;
     height: 92px;
     box-sizing: border-box;
@@ -510,23 +650,22 @@ export default {
     background: #fff;
     display: flex;
     justify-content: space-between;
-    .btn{
+    .btn {
-      width: calc((100% - 16px)/2);
+      width: calc((100% - 16px) / 2);
       height: 41px;
       background: rgba(125, 86, 50, 0.1);
       border-radius: 4px;
       font-size: 16px;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
-      color: #6D5F5E;
+      color: #6d5f5e;
       opacity: 0.6;
     }
-    .change{
+    .change {
-      background: #7D5632;
+      background: #7d5632;
-      color: #FEFFFF;
+      color: #feffff;
       opacity: 1;
     }
   }
 }
-
 </style>

pages/revenueStatistics/detail.vue

@@ -33,7 +33,7 @@
               <view class="contentTop">
                 <view class="contentTopLeft">
 <!--                  <span class="contentMonth">{{thisMonth?thisMonth+'月':'累计'}}</span>-->
-                  <span class="contentTitle">销售明细<span class="contentUnit">/万元</span></span>
+                  <span class="contentTitle">对客销售<span class="contentUnit">/万元</span></span>
                 </view>
 
               </view>
@@ -67,7 +67,7 @@
 
               <view class="tableBox">
                 <view class="tableTop">
-                  <span class="tableTitle">营收明细</span>
+                  <span class="tableTitle">销售明细</span>
                   <span class="tableUnit">/万元</span>
                 </view>
 

pages/revenueStatistics/index.vue

@@ -46,7 +46,7 @@
               <view class="contentTop">
                 <view class="contentTopLeft">
 <!--                  <span class="contentMonth">{{thisMonth?thisMonth+'月':'累计'}}</span>-->
-                  <span class="contentTitle">销售明细<span class="contentUnit">/万元</span></span>
+                  <span class="contentTitle">对客销售<span class="contentUnit">/万元</span></span>
                 </view>
                 <view class="contentTopRight" @click="handleGoSort(1)">
                   <span class="moreText">服务区排名</span>
@@ -83,7 +83,7 @@
 
               <view class="tableBox">
                 <view class="tableTop">
-                  <span class="tableTitle">营收明细</span>
+                  <span class="tableTitle">销售明细</span>
                   <span class="tableUnit">/万元</span>
                 </view>
 

pages/revenueStatistics/servicePartList.vue

@@ -40,7 +40,7 @@
               <view class="modalTitleBox">
                 <view class="modalTitleItem" :style="{width: 'calc(100% - 300rpx)',textAlign:'left'}">
                   <view class="modalIndex"></view>
-                  <text class="modalText">{{ type===1?'销售明细':type===2?'营业收入':type===3?'入区车流':'' }}</text>
+                  <text class="modalText">{{ type===1?'对客销售':type===2?'营业收入':type===3?'入区车流':'' }}</text>
                   <text class="modalUnit">{{type===3?'/万辆':'/万元'+`${type===2?' (除税)':''}`}}</text>
                 </view>
               </view>

pages/robot/index.vue

@@ -1,149 +1,307 @@
 <template>
-  <view class="main">
+  <web-view src="https://eshangtech.com/deepseek/"></web-view>
-    <view class="dialogContentBox">
+  <!-- <web-view src="https://ahyd.eshangtech.com/robot/"></web-view> -->
-      <view :class="item.type===1?'item itemLeft':'item rightItem'" v-for="(item,index) in dialogueList" :key="index" :style="{marginTop: index!==0?'8px':''}">
+<!-- <web-view src="https://saas.eshangtech.com/robot/robot"></web-view> -->
-        <text :id="'printBox' + index" :class="item.type===1?`dialogItem white`:`dialogItem green`">
+  <!-- <view class="main" v-if="false">
-          {{ item.text || '' }}
+    <view
-        </text>
+      class="mainTop"
-      </view>
+      :style="{
-
+        height: menu.bottom + 6 + 'px',
-      <view class="loadingBox" v-if="isLoading">
+        paddingTop: menu.top - 6 + 'px',
-        小驿分析中...
+      }"
+    >
+      <view class="mainTopContent" :style="{ height: menu.height + 12 + 'px' }">
+        <image
+          class="backIcon"
+          src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"
+        />
+        <view class="robotBox">
+          <image
+            class="robotImg"
+            src="https://eshangtech.com/ShopICO/ahyd-BID/robot/robotIcon.png"
+          />
+          <view class="robotDetail">
+            <span class="name">小驿</span>
+            <span class="desc">商业智能助理 </span>
+          </view>
+        </view>
       </view>
     </view>
 
+    <view class="dialogContentBox">
+      <view
+        :class="item.type === 1 ? 'item itemLeft' : 'item rightItem'"
+        v-for="(item, index) in dialogueList"
+        :key="index"
+        :style="{ marginTop: index !== 0 ? '8px' : '' }"
+      >
+        <view
+          :id="'printBox' + index"
+          :class="item.type === 1 ? `dialogItem white` : `dialogItem green`"
+        >
+          {{ item.text || "" }}
+          <view class="line" v-if="item.searchType === 'default'"></view>
+          <view class="defaultBox">
+            <view>你可能想问：</view>
+          </view>
+        </view>
+      </view>
+
+      <view class="loadingBox" v-if="isLoading"> 小驿分析中... </view>
+    </view>
 
     <view class="inputBox">
-      <textarea class="searchText" :value="searchText" @input="handleInput"/>
+      <image
-      <view class="searchBtn" @click="handleSubmit">
+        class="microphone"
-        发送
+        src="https://eshangtech.com/ShopICO/ahyd-BID/robot/microphone.png"
-      </view>
+      />
+      <div class="textBox">
+        <textarea
+          class="searchText"
+          :value="searchText"
+          @input="handleInput"
+          placeholder="有问题尽管问我～"
+        />
+      </div>
+
+       <view class="searchBtn" @click="handleSubmit"> 发送 </view>
     </view>
-  </view>
+  </view> -->
 </template>
 <script >
-import request from '@/util/index.js'
+import request from "@/util/index.js";
 export default {
-  data(){
+  data() {
     return {
-      searchText:'',
+      searchText: "",
-      dialogueList:[],// 对话list  type 1 是居左 2 是居右
+      dialogueList: [], // 对话list  type 1 是居左 2 是居右 searchType default
-      printText:'',
+      printText: "",
-      isLoading: false,// 是否加载中
+      isLoading: false, // 是否加载中
-    }
+      useInfo: {},
+      menu: {},
+    };
   },
-  onLoad(){
+  onLoad() {
-    this.dialogueList.push({text:`您好！我是服务区商业智能助理小驿。\n您想了解服务区哪些方面的信息？`,type:1})
+    this.menu = uni.getMenuButtonBoundingClientRect();
-    this.handlePrintText()
+    console.log("menu", this.menu);
+    this.dialogueList.push({
+      text: `您好！我是服务区商业智能助理小驿。\n您想了解服务区哪些方面的信息？`,
+      type: 1,
+      searchType: "default",
+    });
+    this.handlePrintText();
     // this.printText = `您好！我是服务区商业智能助理小驿。<br>您想了解服务区哪些方面的信息？`
   },
-  methods:{
+  methods: {
-    handleSubmit(){
+    handleSubmit() {
-      let list = this.dialogueList
+      let list = this.dialogueList;
-      console.log('this.searchText',this.searchText)
+      console.log("this.searchText", this.searchText);
-      if(this.searchText){
+      if (this.searchText) {
-        list.push({text:this.searchText,type:2})
+        list.push({ text: this.searchText, type: 2 });
-        this.dialogueList = list
+        this.dialogueList = list;
-        this.$forceUpdate()
+        this.$forceUpdate();
-        this.handleGetData()
+        this.handleGetData();
-        this.searchText= ''
+        this.searchText = "";
       }
     },
     // 输入框中的值
-    handleInput(e){
+    handleInput(e) {
-      console.log('e',e)
+      console.log("e", e);
-      this.searchText = e.detail.value
+      this.searchText = e.detail.value;
     },
     // 查询的方法
-    async handleGetData(){
+    async handleGetData() {
-      this.isLoading = true
+      this.isLoading = true;
-      const data = await request.$webGet('CommercialApi/Analysis/TranslateSentence',{Sentence: this.searchText})
+      const data = await request.$webGet(
-      console.log('data',data)
+        "CommercialApi/Analysis/TranslateSentence",
-      if(data.Result_Code === 999){
+        { Sentence: this.searchText }
-        this.dialogueList.push({text:`'小驿还无法理解，请换个说法我会不停努力学习的！'`,type:1})
+      );
-      }else{
+      console.log("data", data);
-        let str = data.Result_Data.RevenueAnalysis + '\n'
+      if (data.Result_Code === 999) {
-        let obj = data.Result_Data.ServerpartList
+        this.dialogueList.push({
-        if(obj){
+          text: `'小驿还无法理解，请换个说法我会不停努力学习的！'`,
-          for(let key in obj){
+          type: 1,
-            if(str){
+        });
-              str+=`${key}：${this.formatNumber(obj[key].curYearData / 10000)}万元，同比${obj[key].increaseRate>0?'增幅':obj[key].increaseRate<0?'降幅':''}${obj[key].increaseRate ||''}\n`
+      } else {
-            }else{
+        let str = data.Result_Data.RevenueAnalysis + "\n";
-              str = `${key}：${this.formatNumber(obj[key].curYearData / 10000)}万元，同比${obj[key].increaseRate>0?'增幅':obj[key].increaseRate<0?'降幅':''}${obj[key].increaseRate || ''}\n`
+        let list = data.Result_Data.ServerpartList;
+        if (list && list.length > 0) {
+          list.forEach((item) => {
+            let obj = item["RevenueINC"];
+            if (str) {
+              str += `${item.ServerpartName}：${this.formatNumber(
+                obj.curYearData / 10000
+              )}万元${
+                obj.increaseRate > 0
+                  ? "，同比增幅"
+                  : obj.increaseRate < 0
+                  ? "，同比降幅"
+                  : ""
+              }${obj.increaseRate || ""}\n`;
+            } else {
+              str = `${item.ServerpartName}：${this.formatNumber(
+                obj.curYearData / 10000
+              )}万元${
+                obj.increaseRate > 0
+                  ? "，同比同比增幅"
+                  : obj.increaseRate < 0
+                  ? "，同比降幅"
+                  : ""
+              }${obj.increaseRate || ""}\n`;
             }
-          }
+          });
-
         }
 
-
+        this.dialogueList.push({ text: str, type: 1 });
-        this.dialogueList.push({text: str,type:1})
       }
-      this.isLoading = false
+      this.isLoading = false;
     },
     // 打印机效果
-    handlePrintText(){
+    handlePrintText() {
       const query = wx.createSelectorQuery();
-      const contentBox = query.select(`#printBox${this.dialogueList && this.dialogueList.length>0? this.dialogueList.length - 1:0}`)
+      const contentBox = query.select(
-      console.log('contentBox',contentBox)
+        `#printBox${
+          this.dialogueList && this.dialogueList.length > 0
+            ? this.dialogueList.length - 1
+            : 0
+        }`
+      );
+      console.log("contentBox", contentBox);
     },
     formatNumber(num) {
       // 确保输入为数字类型
       num = Number(num);
-      if (isNaN(num)) return '0.00'; // 处理无效数字
+      if (isNaN(num)) return "0.00"; // 处理无效数字
       // 将数字转换为字符串，并分离整数部分和小数部分
-      let parts = num.toString().split('.');
+      let parts = num.toString().split(".");
       // 处理小数部分，不进行四舍五入，直接截取小数点后两位
-      let decimalPart = parts[1] ? parts[1].substring(0, 2) : '00';
+      let decimalPart = parts[1] ? parts[1].substring(0, 2) : "00";
       if (decimalPart.length < 2) {
-        decimalPart = decimalPart.padEnd(2, '0'); // 不足两位补零
+        decimalPart = decimalPart.padEnd(2, "0"); // 不足两位补零
       }
       // 格式化整数部分，添加千分号
-      let integerPart = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+      let integerPart = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
       // 返回带千分号的整数部分和保留两位小数的数字
       return `${integerPart}.${decimalPart}`;
-    }
+    },
-  }
+  },
-}
+};
 </script>
 
 <style scoped lang="scss">
-.main{
+.main {
   width: 100%;
   height: 100vh;
-  background: #f0f0f0;
+  // background: #f0f0f0;
-  .dialogContentBox{
+  background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/robot/robotBackground.png");
+  background-repeat: no-repeat;
+  .mainTop {
+    width: 100%;
+    box-sizing: border-box;
+    .mainTopContent {
+      width: 100%;
+      box-sizing: border-box;
+      padding-left: 32rpx;
+      display: flex;
+      align-items: center;
+      .backIcon {
+        width: 52rpx;
+        height: 52rpx;
+        margin-right: 16rpx;
+      }
+      .robotBox {
+        display: flex;
+        align-items: center;
+        .robotImg {
+          width: 68rpx;
+          height: 68rpx;
+          margin-right: 16rpx;
+        }
+        .robotDetail {
+          display: flex;
+          flex-direction: column;
+          .name {
+            font-family: PingFangSC, PingFang SC;
+            font-weight: 600;
+            font-size: 28rpx;
+            color: #090c1a;
+            line-height: 40rpx;
+            text-align: left;
+            font-style: normal;
+          }
+          .desc {
+            font-family: PingFangSC, PingFang SC;
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #787879;
+            line-height: 36rpx;
+            text-align: justify;
+            font-style: normal;
+          }
+        }
+      }
+    }
+  }
+
+  .dialogContentBox {
     width: 100%;
     height: calc(100vh - 90px);
     overflow-y: scroll;
     box-sizing: border-box;
-    padding: 12px;
+    padding: 32rpx;
-    .item{
+    .item {
       display: flex;
       align-items: center;
-      .dialogItem{
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 30rpx;
+      color: #090c1a;
+      line-height: 44rpx;
+      text-align: left;
+      font-style: normal;
+      .dialogItem {
+        max-width: calc(100vw - 64rpx);
         display: block;
-        max-width: 80vw;
         box-sizing: border-box;
-        padding: 4px;
+        padding: 24rpx 32rpx;
         border-radius: 4px;
+        background: #ffffff;
+        border-radius: 0rpx 24rpx 24rpx 24rpx;
+        .line {
+          width: 100%;
+          height: 2rpx;
+          background: #f2f2f2;
+          border-radius: 16rpx;
+          margin: 24rpx 0;
+        }
+        .defaultBox {
+          .clickItem {
+            font-family: PingFangSC, PingFang SC;
+            font-weight: 400;
+            font-size: 30rpx;
+            color: #2363ff;
+            line-height: 44rpx;
+            text-align: left;
+            font-style: normal;
+          }
+        }
       }
-      .white{
+      .white {
-        border: 1px solid #ccc;
         background: #fff;
         color: #000;
       }
-      .green{
+      .green {
-        background: #12A153FF;
+        background: #12a153ff;
         color: #fff;
       }
     }
-    .itemLeft{
+    .itemLeft {
       justify-content: flex-start;
     }
-    .rightItem{
+    .rightItem {
       justify-content: flex-end;
     }
-    .loadingBox{
+    .loadingBox {
       font-size: 12px;
       color: #ccc;
       width: 100%;
@@ -151,28 +309,33 @@ export default {
       justify-content: center;
     }
   }
-  .inputBox{
+  .inputBox {
     width: 100%;
-    height: 80px;
+    height: 180rpx;
-    background: hsla(0,0%,97%,.98);
+    background: #fff;
-    border-top: 1px solid #ccc;
     position: fixed;
     left: 0;
     bottom: 0;
     box-sizing: border-box;
-    padding: 0 8px 4px;
+    padding: 16rpx 32rpx;
+    padding-bottom: env(safe-area-inset-bottom);
     display: flex;
     align-items: center;
-    .searchText{
+    .microphone {
-      background: #fff;
+      width: 48rpx;
-      flex: 1;
+      height: 48rpx;
-      height: 40px;
+      margin-right: 16rpx;
-      box-sizing: border-box;
-      border-radius: 8px;
-      padding: 4px 8px 0;
-      font-size: 14px;
     }
-    .searchBtn{
+    .textBox {
+      width: calc(100% - 64rpx);
+      height: 88rpx;
+      background: #f2f3f7;
+      border-radius: 44rpx;
+    }
+
+    .searchText {
+    }
+    .searchBtn {
       width: 80px;
       height: 40px;
       box-sizing: border-box;

pages/serviceAreaReimbursement/serviceAreaReimbursement.vue

@@ -89,12 +89,12 @@
 					}
 					,{
 						name:'付款审批',
-						src: '../../../../../static/images/expense/type/jkdsp.png',
+						src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/jkdsp.png',
 						typeId:2000
 					}
 					,{
 						name:'资金拨付',
-						src: '../../../../../static/images/expense/type/bzjtf.png',
+						src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/bzjtf.png',
 						typeId:4000
 					}
 				],

pages/settlementApproval/detail.vue

@@ -1263,6 +1263,8 @@ export default {
         // // const data = await request.$webPost('EShangApiMain/Finance/ApplyAccountProinst', req)
       }else{
         // 月度
+
+
         console.log('this.nextPersonValue',this.nextPersonValue)
         let [APPOVED_NAME,APPOVED_IDS] = this.nextPersonValue.split('-')
         console.log('APPOVED_IDS',APPOVED_IDS)
@@ -1385,6 +1387,14 @@ export default {
     },
     // 显示发起申请的悬浮框
     async handleShowApplyForPop(){
+      uni.showToast({
+        icon:'none',
+        duration: 2000,
+        title: '请到电脑端发起结算！',
+      });
+      return
+
+
       let _this = this
       if(this.detailObj.SETTLEMENT_TYPE===2){
         // 月度

pages/summaryOfPortraits/components/businessPortrait.vue

@@ -296,6 +296,9 @@ export default {
         },
       //获取服务区基本信息
       async getServiceInfo(){
+        if(!this.serviceInfo.Serverpart_ID){
+          return
+        }
         let req = {
           ServerpartId:this.serviceInfo.Serverpart_ID
         }
@@ -593,6 +596,7 @@ export default {
 
         },
         async getBusinessTypeList(){
+          console.log('getBusinessTypeList')
             let req
             if (this.serviceInfo.SERVERPART_NAME==='安徽驿达'){
               req = {
@@ -600,8 +604,8 @@ export default {
                 StatisticsDate:this.time,
                 BusinessTradeIds:-1
               }
-              this.businessTypeList = []
+              // this.businessTypeList = []
-              return
+              // return
             }else{
               req = {
                 ProvinceCode:'340000',

pages/summaryOfPortraits/components/carPortrait.vue

@@ -1208,6 +1208,7 @@ export default {
                   res.Result_Data.OtherData.forEach(item=>{
                       list.push({name:item,value:item})
                   })
+                console.log('this.carTypeList',list)
                   this.carTypeList =list
                   this.isFirst = false
               }
@@ -1331,6 +1332,8 @@ export default {
                       this.carTypeTimeDataAll[2] ={categories:result[2].Vehicle_Type?result[2].Vehicle_Type:[], series:[series[5],series[4]]}
                   }
                   this.carTypeTimeData = this.carTypeTimeDataAll[this.selectTab]?this.carTypeTimeDataAll[this.selectTab]:[]
+                console.log('this.carTypeTimeDataAll',this.carTypeTimeDataAll)
+                console.log('this.carTypeTimeData',this.carTypeTimeData)
               }else{
                   this.carTypeTimeDataAll = []
                   this.carTypeTimeData = []

pages/summaryOfPortraits/components/components/car/carTypeTime.vue

@@ -62,6 +62,8 @@ export default {
         handleTap(e){
           uChartsInstance[e.target.id].showToolTip(e,{
             formatter: (item, category, index, opts) =>{
+              console.log('item',item)
+              console.log('opts',opts)
               if (this.num===0){
                 this.num++
                 return '日均车辆' + ":" + opts.series[0].valueList[index] + '辆,占比' + item.data + '%';

pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js

@@ -155,7 +155,9 @@ const cfu = {
 		  return item.name + ":" + item.data + '辆';
 	  },
 	  carTypeTime:function (item, category, index, opts){
-		  if (this.num===0){
+		  console.log('item',item)
+		  console.log('opts',opts)
+		  if (item.name==='车辆类型'){
 			  this.num++
 			  return '日均车辆' + ":" + opts.series[0].valueList[index] + '辆,占比' + item.data + '%';
 		  }else{

pages/summaryOfPortraits/index.vue

@@ -107,11 +107,16 @@ export default {
   },
   onShow(){
       console.log('onShow')
+      console.log('selectPortrait',this.selectPortrait)
       this.isShowSwiper = true
       let seat = uni.getStorageSync('currentService')
       console.log('seat',seat)
       this.serviceInfo = seat
-      this.selectPortrait = this.query.index ? this.query.index: seat.SERVERPART_NAME==='安徽驿达' ? 1:0
+      if(this.selectPortrait){
+
+      }else{
+        this.selectPortrait = this.query.index ? this.query.index: seat.SERVERPART_NAME==='安徽驿达' ? 1:0
+      }
   },
   onHide(){
     this.isShowSwiper = false

pages/testPage/index.vue

@@ -0,0 +1,225 @@
+<template>
+  <div class="main">
+    <template v-if="webViewSrc">
+      <web-view
+        id="myWebView"
+        ref="myWebView"
+        :src="webViewSrc"
+        @message="onMessage"
+      ></web-view>
+    </template>
+    <!-- @load="onMinLoad" -->
+
+    <!-- <span @click="handleGetPoint">获取位置信息</span> -->
+  </div>
+  <!-- src="https://saas.eshangtech.com/goaliPay/index.html" -->
+
+  <!-- src="https://ahyd.eshangtech.com/goaliPay/index.html" -->
+</template> 
+  
+<script>
+import { mapGetters } from "vuex";
+export default {
+  data() {
+    return {
+      message: "",
+      webViewSrc: ``,
+      nowObj: {},
+      loginType: "",
+    };
+  },
+  computed: {
+    ...mapGetters({
+      user: "user",
+    }),
+  },
+  async onLoad() {
+    this.webViewSrc = `https://eshangtech.com/goaliPay/testwx.html`;
+    return;
+
+    let type = uni.getStorageSync("loginType");
+    console.log("loginType", type);
+    this.loginType = type;
+    let obj = {
+      loginType: type,
+      phone: this.user.MEMBERSHIP_MOBILEPHONE,
+    };
+    this.nowObj = obj;
+    const jsonString = JSON.stringify(obj);
+    const encodedData = encodeURIComponent(jsonString);
+    console.log("encodedData", encodedData);
+    if (type === "min") {
+      // const code = await this.login();
+      // console.log("dasldhasodhbasoudh", code);
+      // const codeString = JSON.stringify(code);
+      // const encodedCode = encodeURIComponent(codeString);
+      // console.log("encodedCode", encodedCode);
+      this.webViewSrc = `https://eshangtech.com/goaliPay/testwx.html`;
+      // https://ahyd.eshangtech.com/goaliPay/index.html
+      // https://saas.eshangtech.com/goaliPay/index.html
+    } else {
+      this.webViewSrc = `https://saas.eshangtech.com/goaliPay/index.html#${encodedData}`;
+    }
+    console.log("this.webViewSrc", this.webViewSrc);
+  },
+  methods: {
+    async onMinLoad() {
+      // console.log("111", 11);
+      // const code = await this.login();
+      // console.log("dasldhasodhbasoudh", code);
+      // const codeString = JSON.stringify(code);
+      // const encodedCode = encodeURIComponent(codeString);
+      // console.log("encodedCode", encodedCode);
+      // this.webViewSrc = `https://eshangtech.com/goaliPay/testwx.html#${encodedCode}`;
+      // this.webViewSrc = `https://eshangtech.com/goaliPay/testwx.html`;
+      // console.log("this.webViewSrc", this.webViewSrc);
+    },
+    handleGetPoint() {
+      $wanmeiyizhan.handleGetPosition().then((res) => {});
+    },
+    onMessage(event) {
+      let _this = this;
+      console.log("收到 H5 的消息:", event.detail.data[0]);
+      if (event.detail.data[0].action === "scanCode") {
+        uni.scanCode({
+          success: function (res) {
+            console.log("res", res);
+            _this.sendMessageToH5({ type: "scanCode", res: res });
+          },
+        });
+      } else if (event.detail.data[0].action === "position") {
+        // let req = {
+        //   membershipId: _this.user.MEMBERSHIP_ID,
+        // };
+
+        // _this.$api.$get("/Html5/GetMemberLocation", req).then((res) => {
+        //   console.log("resdasda", res);
+        // });
+
+        plus.geolocation.getCurrentPosition(async function (position) {
+          console.log("当前位置:", position);
+          let res = position.coords;
+          let seatInfo = {
+            latitude: res.latitude,
+            longitude: res.longitude,
+          };
+          _this.sendMessageToH5({ type: "position", res: seatInfo });
+        });
+      } else if (event.detail.data[0].action === "openLocation") {
+        let obj = event.detail.data[0].res;
+        console.log("openLocation", obj);
+        uni.openLocation({
+          latitude: obj.latitude * 1,
+          longitude: obj.longitude * 1,
+          scale: 16, // 缩放比例
+          name: obj.name,
+          address: "", // 这个可能会影响地图的定位，所以可以选择不填
+          success(data) {
+            console.log(data);
+          },
+          fail(err) {
+            console.log(err);
+          },
+        });
+      } else if (event.detail.data[0].action === "openNewPage") {
+        let obj = event.detail.data[0].res;
+        console.log("openNewPage", obj);
+        uni.navigateTo({
+          url: `/pages/thirdParty/newPage?url=${obj.url}&title=${obj.title}`,
+        });
+      } else if (event.detail.data[0].action === "backPage") {
+        uni.navigateBack({
+          delta: 1,
+        });
+      }
+      // event.data 包含 H5 发送过来的消息内容
+    },
+    sendMessageToH5(data) {
+      console.log("收到消息", data);
+      let obj = this.nowObj;
+      obj[data.type] = data.res;
+      this.nowObj = obj;
+      console.log("obj", obj);
+      const jsonString = JSON.stringify(obj);
+      const encodedData = encodeURIComponent(jsonString);
+      console.log("encodedData", encodedData);
+      this.webViewSrc = `https://saas.eshangtech.com/goaliPay/index.html#${encodedData}`;
+      console.log("this.webViewSrc", this.webViewSrc);
+      // const webView = this.$refs.myWebView;
+      // webView.postMessage(data);
+    },
+    async login() {
+      let str = Math.random().toString(36).substr(2, 15);
+      let time = Math.floor(Date.now() / 1000);
+
+      let jsapi_ticket = await this.$api.$get(
+        "/EShangApiMain/WeChat/GetJsapiTicket",
+        {
+          appId: "wx4c497eddcec4a0e7",
+          sourcePlatform: "minprogram",
+          // minprogram
+          // publicprogram
+        }
+      );
+      console.log("jsapi_ticket", jsapi_ticket);
+      const req = {
+        jsapi_ticket: jsapi_ticket.Result_Data,
+        appId: "wx4c497eddcec4a0e7",
+        // wx4c497eddcec4a0e7 min
+        //  wxcf4dbe1815d5d872
+        timestamp: time,
+        nonceStr: str,
+        url: `https://eshangtech.com/goaliPay/testwx.html`,
+        jsApiList: ["openLocation", "getLocation", "scanQRCode"],
+      };
+      console.log("req321312", req);
+      const data = await this.$api.$post(
+        "/EShangApiMain/WeChat/GetConfigSignature",
+        req
+      );
+      console.log("datalogin", data);
+      req.result = data.Result_Data;
+      return req;
+
+      // let str = this.generateNonceStr();
+      // let time = new Date().getTime();
+      // fetch(
+      //   `https://api.eshangtech.com/EShangApiMain/WeChat/GetJsapiTicket?appId=wx4c497eddcec4a0e7&sourcePlatform=minprogram`
+      // )
+      //   .then((response) => response.json())
+      //   .then((data) => {
+      //     wx.config({
+      //       debug: true, // 开启调试模式
+      //       appId: "wx4c497eddcec4a0e7", // 微信公众号或小程序的AppID
+      //       timestamp: time, // 时间戳
+      //       nonceStr: str, // 随机字符串
+      //       signature: data.signature, // 签名
+      //       jsApiList: ["openLocation", "scanQRCode", "getLocation"], // 需要调用的API列表
+      //     });
+
+      //     wx.ready(function () {});
+      //   });
+    },
+    generateNonceStr(length = 16) {
+      let nonceStr = "";
+      const characters =
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+      // 使用当前时间戳作为随机种子
+      const timestamp = Date.now();
+      // 拼接时间戳和随机数
+      for (let i = 0; i < length; i++) {
+        nonceStr += characters.charAt(
+          Math.floor(Math.random() * characters.length)
+        );
+      }
+      return nonceStr + timestamp.toString(36).slice(-4); // 添加时间戳的后4位，增加唯一性
+    },
+  },
+};
+</script>
+<style scoped lang="less">
+.main {
+  width: 100vw;
+  height: 100vh;
+}
+</style>

pages/userCenter/userCenter.vue

@@ -1,30 +1,50 @@
 <template>
   <view class="main" style="padding-bottom: env(safe-area-inset-bottom)">
     <view class="userBg">
-      <div class="headerTop" :style="{ height: menu.bottom + 5 + 'px'}">
+      <div class="headerTop" :style="{ height: menu.bottom + 5 + 'px' }">
-        <view class="news" :style="{ top: menu.top+16 + 'px', lineHeight: menu.bottom - menu.top + 'px' }">
+        <view
+          class="news"
+          :style="{
+            top: menu.top + 16 + 'px',
+            lineHeight: menu.bottom - menu.top + 'px',
+          }"
+        >
           <view class="box">
-<!--              @click="handleNews"-->
+            <!--              @click="handleNews"-->
-            <image  class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/index/news.svg" @click="handleNews"></image>
+            <image
+              class="img"
+              src="https://eshangtech.com/ShopICO/ahyd-BID/index/news.svg"
+              @click="handleNews"
+            ></image>
             <view class="red"></view>
           </view>
         </view>
-        <view class="userTitle" :style="{ top: menu.top + 'px', lineHeight: menu.bottom - menu.top + 'px' }">我的</view>
+        <view
+          class="userTitle"
+          :style="{
+            top: menu.top + 'px',
+            lineHeight: menu.bottom - menu.top + 'px',
+          }"
+          >我的</view
+        >
       </div>
       <div class="userBox" :style="{ top: menu.bottom + 18 + 'px' }">
-        <image class="userBgImg" src="https://eshangtech.com/ShopICO/ahyd-BID/user/userBg.png"></image>
+        <image
+          class="userBgImg"
+          src="https://eshangtech.com/ShopICO/ahyd-BID/user/userBg.png"
+        ></image>
         <view class="box" v-if="user.Membership_Id">
           <view class="headImg">
             <image :src="user.Membership_Headimage"></image>
           </view>
           <view class="message">
             <view class="people">
-              <p class="name">{{user.Membership_Name}}</p>
+              <p class="name">{{ user.Membership_Name }}</p>
-<!--              <view class="person"> <view class="personName">{{user.DepartmentName}}</view> </view>-->
+              <!--              <view class="person"> <view class="personName">{{user.DepartmentName}}</view> </view>-->
-              <view class="person">{{user.DepartmentName}}</view>
+              <view class="person">{{ user.DepartmentName }}</view>
             </view>
             <p class="phone">{{ handleGetPhone(user.Membership_Phone) }}</p>
-            <p class="address">{{user.OwnerUnitName}}</p>
+            <p class="address">{{ user.OwnerUnitName }}</p>
           </view>
         </view>
         <view v-else>
@@ -40,383 +60,447 @@
     </view>
 
     <view class="menu" :style="{ top: -(117 - menu.bottom) + 'px' }">
-        <userList v-for="(item, index) in dataList" :key="index" :item='item' :lastDay="lastDay" ></userList>
+      <userList
+        v-for="(item, index) in dataList"
+        :key="index"
+        :item="item"
+        :lastDay="lastDay"
+      ></userList>
     </view>
 
-    <Tabbar ref="tabbar" :page="page" ></Tabbar>
+    <Tabbar ref="tabbar" :page="page"></Tabbar>
   </view>
 </template>
 
 <script>
-import request from '@/util/index.js'
+import request from "@/util/index.js";
-import {mapActions, mapState} from 'vuex'
+import { mapActions, mapState } from "vuex";
-  import userList from "./components/userList.vue";
+import userList from "./components/userList.vue";
 import Tabbar from "../../components/tabbar/tabbar.vue";
-	export default {
+export default {
-		data() {
+  data() {
-      const lastDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD', -1)
+    const lastDay = this.$util.cutDate(new Date(), "YYYY-MM-DD", -1);
-			return {
+    return {
-        page:'/pages/userCenter/userCenter',
+      page: "/pages/userCenter/userCenter",
-        statusBarHeight:'',
+      statusBarHeight: "",
-        menu:'',
+      menu: "",
-        lastDay:lastDay,
+      lastDay: lastDay,
-        userLists:[  { url: 'https://eshangtech.com/ShopICO/ahyd-BID/user/position.svg', name: '我的服务区', value: 1 },
+      userLists: [
-          { url: 'https://eshangtech.com/ShopICO/ahyd-BID/user/limit.svg', name: '我的权限', value: 2 },],
+        {
-        dataList :[
+          url: "https://eshangtech.com/ShopICO/ahyd-BID/user/position.svg",
-          {
+          name: "我的服务区",
-            name: '商业经营',
+          value: 1,
-            value: 1,
+        },
-            list: [
+        {
-              {
+          url: "https://eshangtech.com/ShopICO/ahyd-BID/user/limit.svg",
-                id:'74934d31-385a-4eed-80bb-9c9ed7da29b5',
+          name: "我的权限",
-                name: '每日营收',
+          value: 2,
-                homeUrl: '/pages/everdayRenven/index',
+        },
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/dailyRevenue.svg',
+      ],
-                bgUrl:'https://eshangtech.com/ShopICO/ahyd-BID/user/firstBg_1.png',
+      dataList: [
-                isNotice:true,
+        {
-                value: 1,
+          name: "商业经营",
-              },
+          value: 1,
-              {
+          list: [
-                id:'',
+            {
-                name: '节日特刊',
+              id: "74934d31-385a-4eed-80bb-9c9ed7da29b5",
-                homeUrl: `/pages/nationalPage/index?time=${lastDay}&type=true`,
+              name: "每日营收",
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/festival.svg',
+              homeUrl: "/pages/everdayRenven/index",
-                bgUrl:'https://eshangtech.com/ShopICO/ahyd-BID/user/firstBg_2.png',
+              imagePath:
-                isNotice:true,
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/dailyRevenue.svg",
-                value: 1,
+              bgUrl:
-              },
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/firstBg_1.png",
-              {
+              isNotice: true,
-                id:'4a34e1d4-47c9-4c06-8e8e-f38c6bd9450b',
+              value: 1,
-                name: '经营报表',
+            },
-                homeUrl: '/pages/operatingStatements/index',
+            {
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/reportForms.svg',
+              id: "",
-                bgUrl:'https://eshangtech.com/ShopICO/ahyd-BID/user/firstBg_3.png',
+              name: "节日特刊",
-                isNotice:true,
+              homeUrl: `/pages/nationalPage/index?time=${lastDay}&type=true`,
-                value: 1,
+              imagePath:
-              },
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/festival.svg",
-            ],
+              bgUrl:
-          },
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/firstBg_2.png",
-          {
+              isNotice: true,
-            name: '商业画像',
+              value: 1,
-            value: 2,
+            },
-            list: [
+            {
-              {
+              id: "4a34e1d4-47c9-4c06-8e8e-f38c6bd9450b",
-                id:'',
+              name: "经营报表",
-                name: '车流',
+              homeUrl: "/pages/operatingStatements/index",
-                homeUrl: '/pages/commercialBINew/carPortrait',
+              imagePath:
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/traffic.svg',
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/reportForms.svg",
-                isNotice:'',
+              bgUrl:
-                type:1,
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/firstBg_3.png",
-                value: 2,
+              isNotice: true,
-              },
+              value: 1,
-              {
+            },
-                id:'',
+          ],
-                name: '客群',
+        },
-                homeUrl: '/pages/commercialBI/guestPortrait',
+        {
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/customerGroup.svg',
+          name: "商业画像",
-                isNotice:'',
+          value: 2,
-                type:2,
+          list: [
-                value: 2,
+            {
-              },
+              id: "",
-              {
+              name: "车流",
-                id:'',
+              homeUrl: "/pages/commercialBINew/carPortrait",
-                name: '经营',
+              imagePath:
-                homeUrl: '/pages/commercialBI/managePortrait',
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/traffic.svg",
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/manage.svg',
+              isNotice: "",
-                isNotice:'',
+              type: 1,
-                type:3,
+              value: 2,
-                value: 2,
+            },
-              },
+            {
-              {
+              id: "",
-                id:'',
+              name: "客群",
-                name: '交易',
+              homeUrl: "/pages/commercialBI/guestPortrait",
-                homeUrl: '/pages/commercialBI/businessPortrait',
+              imagePath:
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/business.svg',
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/customerGroup.svg",
-                isNotice:'',
+              isNotice: "",
-                type:4,
+              type: 2,
-                value: 2,
+              value: 2,
-              },
+            },
-              {
+            {
-                id:'',
+              id: "",
-                name: '品牌',
+              name: "经营",
-                homeUrl: '/pages/commercialBI/formatPortrait',
+              homeUrl: "/pages/commercialBI/managePortrait",
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/brand.svg',
+              imagePath:
-                isNotice:'',
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/manage.svg",
-                type:5,
+              isNotice: "",
-                value: 2,
+              type: 3,
-              },
+              value: 2,
-            ],
+            },
-          },
+            {
-          {
+              id: "",
-            name: '业务审批',
+              name: "交易",
-            value: 3,
+              homeUrl: "/pages/commercialBI/businessPortrait",
-            list: [
+              imagePath:
-              {
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/business.svg",
-                id:'1a2907bd-c2f5-4ef9-9ead-70496650ace6',
+              isNotice: "",
-                name: '财务审批',
+              type: 4,
-                homeUrl: '/pages/expenseApproval/expenseApproval',
+              value: 2,
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/financialApproval.svg',
+            },
-                notice:0,
+            {
-                value: 3,
+              id: "",
-                isNotice:false
+              name: "品牌",
-              },
+              homeUrl: "/pages/commercialBI/formatPortrait",
-              {
+              imagePath:
-                id:'916cdbb5-f05b-4624-b6c4-9f111d4389fc',
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/brand.svg",
-                name: '招标投标',
+              isNotice: "",
-                homeUrl: '/pages/tender/tender',
+              type: 5,
-                notice:0,
+              value: 2,
-                value: 3,
+            },
-                isNotice:false,
+          ],
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/bidding.svg',
+        },
-              },
+        {
-              {
+          name: "业务审批",
-                id:'8fea5036-d67e-476e-9e56-5f379ba6ae18',
+          value: 3,
-                name: '服务区报销',
+          list: [
-                homeUrl: '/pages/serviceAreaReimbursement/serviceAreaReimbursement',
+            {
-                notice:0,
+              id: "1a2907bd-c2f5-4ef9-9ead-70496650ace6",
-                value: 3,
+              name: "财务审批",
-                isNotice:false,
+              homeUrl: "/pages/expenseApproval/expenseApproval",
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/serviceAreaReimbur.svg',
+              imagePath:
-              },
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/financialApproval.svg",
-              {
+              notice: 0,
-                id:'ac661db4-1af1-4732-88db-76bc05eec335',
+              value: 3,
-                name: '合同审批',
+              isNotice: false,
-                homeUrl: '/pages/contract/contract',
+            },
-                notice:0,
+            {
-                value: 3,
+              id: "916cdbb5-f05b-4624-b6c4-9f111d4389fc",
-                isNotice:false,
+              name: "招标投标",
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/contractApproval.svg',
+              homeUrl: "/pages/tender/tender",
-              },
+              notice: 0,
-              {
+              value: 3,
-                id:'056b29d7-4721-47ee-ad25-660814e1f3a9',
+              isNotice: false,
-                name: '商品审批',
+              imagePath:
-                homeUrl: '/pages/businessApproval/businessApproval',
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/bidding.svg",
-                notice:0,
+            },
-                value: 3,
+            {
-                isNotice:false,
+              id: "8fea5036-d67e-476e-9e56-5f379ba6ae18",
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/productApproval.svg',
+              name: "服务区报销",
-              },
+              homeUrl:
-              {
+                "/pages/serviceAreaReimbursement/serviceAreaReimbursement",
-                id:'2290e96d-c6d7-4dde-b5b7-e699b615ff2f',
+              notice: 0,
-                name: '招商审批',
+              value: 3,
-                homeUrl: '/pages/investment/investment',
+              isNotice: false,
-                notice:0,
+              imagePath:
-                value: 3,
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/serviceAreaReimbur.svg",
-                isNotice:false,
+            },
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/promotionApproval.svg',
+            {
-              },
+              id: "ac661db4-1af1-4732-88db-76bc05eec335",
-              {
+              name: "合同审批",
-                id:'c802a38f-3bbd-4db0-89b6-34e404c8d8cc',
+              homeUrl: "/pages/contract/contract",
-                name: '权限审批',
+              notice: 0,
-                homeUrl: '/pages/authorityApproval/index',
+              value: 3,
-                notice:0,
+              isNotice: false,
-                value: 3,
+              imagePath:
-                isNotice:false,
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/contractApproval.svg",
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/authorityApproval.svg',
+            },
-              },
+            {
-              {
+              id: "056b29d7-4721-47ee-ad25-660814e1f3a9",
-                id:'b0b63a75-56c9-4f1d-aacb-a26e62b47e3e',
+              name: "商品审批",
-                name: '数据校验',
+              homeUrl: "/pages/businessApproval/businessApproval",
-                homeUrl: '/pages/dataSummary/dataSummary',
+              notice: 0,
-                notice:0,
+              value: 3,
-                value: 3,
+              isNotice: false,
-                isNotice:false,
+              imagePath:
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/dataVerification.svg',
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/productApproval.svg",
-              },
+            },
-              {
+            {
-                id:'b0b63a75-56c9-4f1d-aacb-a26e62b47e3e',
+              id: "2290e96d-c6d7-4dde-b5b7-e699b615ff2f",
-                name: '分润切换',
+              name: "招商审批",
-                homeUrl: '/pages/projectWarning/index',
+              homeUrl: "/pages/investment/investment",
-                notice:0,
+              notice: 0,
-                value: 3,
+              value: 3,
-                isNotice:false,
+              isNotice: false,
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/index/changeMoney.svg',
+              imagePath:
-              },
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/promotionApproval.svg",
-              {
+            },
-                id:'a927bf4d-f924-4034-b964-d1a8bd401d09',
+            {
-                name: '结算审批',
+              id: "c802a38f-3bbd-4db0-89b6-34e404c8d8cc",
-                homeUrl: '/pages/settlementApproval/index',
+              name: "权限审批",
-                notice:0,
+              homeUrl: "/pages/authorityApproval/index",
-                value: 3,
+              notice: 0,
-                isNotice:false,
+              value: 3,
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/index/changeMoney.svg',
+              isNotice: false,
-              },
+              imagePath:
-            ],
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/authorityApproval.svg",
-          },
+            },
-          {
+            {
-            name: '现场管理',
+              id: "b0b63a75-56c9-4f1d-aacb-a26e62b47e3e",
-            value: 4,
+              name: "数据校验",
-            list: [
+              homeUrl: "/pages/dataSummary/dataSummary",
-              {
+              notice: 0,
-                id:'',
+              value: 3,
-                name: '基础信息',
+              isNotice: false,
-                homeUrl: '/pages/map/detail?come=user',
+              imagePath:
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/basicInformation.svg',
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/dataVerification.svg",
-                isNotice:true,
+            },
-                notice:0,
+            {
-                type:0,
+              id: "b0b63a75-56c9-4f1d-aacb-a26e62b47e3e",
-                summaryOfPortraits: true,
+              name: "分润切换",
-                value: 4,
+              homeUrl: "/pages/projectWarning/index",
-              },
+              notice: 0,
-              {
+              value: 3,
-                id:'30f0e7d0-4e01-4a63-a65b-613e1f427335',
+              isNotice: false,
-                name: '考评考核',
+              imagePath:
-                homeUrl: '/pages/examine/index',
+                "https://eshangtech.com/ShopICO/ahyd-BID/index/changeMoney.svg",
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/assessment.svg',
+            },
-                isNotice:false,
+            {
-                notice:0,
+              id: "a927bf4d-f924-4034-b964-d1a8bd401d09",
-                summaryOfPortraits: true,
+              name: "结算审批",
-                type:6,
+              homeUrl: "/pages/settlementApproval/index",
-                value: 4,
+              notice: 0,
-              },
+              value: 3,
-              {
+              isNotice: false,
-                id:'d405ae13-3388-41c0-a5f6-d11194d0a943',
+              imagePath:
-                name: '投诉建议',
+                "https://eshangtech.com/ShopICO/ahyd-BID/index/changeMoney.svg",
-                homeUrl: '/pages/suggestion/suggestion',
+            },
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/complaintSuggest.svg',
+            {
-                isNotice:false,
+              id: "632e1a7f-de9e-4553-b5c0-f1bc77abc08c",
-                notice:0,
+              name: "结算提单",
-                value: 4,
+              homeUrl: "/pages/billOfLading/index",
-              },
+              notice: 0,
-              {
+              value: 3,
-                id:'ebd8cae4-d36d-4ea0-a7e9-61e566bf9e24',
+              isNotice: false,
-                name: '收银稽查',
+              imagePath:
-                homeUrl: '/pages/cashAudit/list',
+                "https://eshangtech.com/ShopICO/ahyd-BID/index/changeMoney.svg",
-                imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/cashierInspection.svg',
+            },
-                isNotice:false,
+          ],
-                notice:0,
+        },
-                value: 4,
+        {
-              },
+          name: "现场管理",
-            ],
+          value: 4,
-          },
+          list: [
-        ],
+            {
-        isTrue:false,//最外面一层判断是否能跳转的依据
+              id: "",
-        special:false
+              name: "基础信息",
-      };
+              homeUrl: "/pages/map/detail?come=user",
-		},
+              imagePath:
-    components:{
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/basicInformation.svg",
-      userList,Tabbar
+              isNotice: true,
-    },
+              notice: 0,
-		computed: {
+              type: 0,
-			...mapState({
+              summaryOfPortraits: true,
-        toDoMsg:(state)=>{return state.toDoMsg},
+              value: 4,
-				user: (state)=>{ return state.userData},
+            },
-				phone: (state)=>{
+            {
-					let phoneStr = state.userData.Membership_Phone
+              id: "30f0e7d0-4e01-4a63-a65b-613e1f427335",
-					if(phoneStr){
+              name: "考评考核",
-						return phoneStr.substr(0,3)+' **** '+phoneStr.substr(phoneStr.length-2,phoneStr.length-1)
+              homeUrl: "/pages/examine/index",
-					}else {
+              imagePath:
-						return ''
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/assessment.svg",
-					}
+              isNotice: false,
-				},
+              notice: 0,
-
+              summaryOfPortraits: true,
-			})
+              type: 6,
-		},
+              value: 4,
-    onLoad(){
+            },
-      // 获取手机参数 对页面进行自适应
+            {
-      let systemInfo = uni.getSystemInfoSync()
+              id: "d405ae13-3388-41c0-a5f6-d11194d0a943",
-      this.statusBarHeight = Number(systemInfo.statusBarHeight)
+              name: "投诉建议",
-      //拿到登录用户有权限的内容
+              homeUrl: "/pages/suggestion/suggestion",
-      this.menu = uni.getMenuButtonBoundingClientRect()
+              imagePath:
-      this.handleGetWarningList()
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/complaintSuggest.svg",
-        this.dataList[2].list.forEach(item=>{
+              isNotice: false,
-          for(let key in this.user.AuthorityInfo){
+              notice: 0,
-            if (key === item.id){
+              value: 4,
-              if (this.user.AuthorityInfo[key]===1){
+            },
-                item.isNotice = true
+            {
-              }
+              id: "ebd8cae4-d36d-4ea0-a7e9-61e566bf9e24",
-            }
+              name: "收银稽查",
-          }
+              homeUrl: "/pages/cashAudit/list",
-          if(item.id==='a927bf4d-f924-4034-b964-d1a8bd401d09'){
+              imagePath:
-            item.isNotice = true
+                "https://eshangtech.com/ShopICO/ahyd-BID/user/cashierInspection.svg",
-          }
+              isNotice: false,
-        })
+              notice: 0,
-      //拿到登录用户有权限的内容 判断是否有角标
+              value: 4,
-      this.dataList[3].list.forEach(item=>{
+            },
-        for(let key in this.user.AuthorityInfo){
+          ],
-          if (key === item.id){
+        },
-            if (this.user.AuthorityInfo[key]===1){
+      ],
-              item.isNotice = true
+      isTrue: false, //最外面一层判断是否能跳转的依据
-            }
+      special: false,
+    };
+  },
+  components: {
+    userList,
+    Tabbar,
+  },
+  computed: {
+    ...mapState({
+      toDoMsg: (state) => {
+        return state.toDoMsg;
+      },
+      user: (state) => {
+        return state.userData;
+      },
+      phone: (state) => {
+        let phoneStr = state.userData.Membership_Phone;
+        if (phoneStr) {
+          return (
+            phoneStr.substr(0, 3) +
+            " **** " +
+            phoneStr.substr(phoneStr.length - 2, phoneStr.length - 1)
+          );
+        } else {
+          return "";
+        }
+      },
+    }),
+  },
+  onLoad() {
+    // 获取手机参数 对页面进行自适应
+    let systemInfo = uni.getSystemInfoSync();
+    this.statusBarHeight = Number(systemInfo.statusBarHeight);
+    //拿到登录用户有权限的内容
+    this.menu = uni.getMenuButtonBoundingClientRect();
+    this.handleGetWarningList();
+    this.dataList[2].list.forEach((item) => {
+      for (let key in this.user.AuthorityInfo) {
+        if (key === item.id) {
+          if (this.user.AuthorityInfo[key] === 1) {
+            item.isNotice = true;
           }
         }
-      })
-      //拿到登录用户有权限的内容 判断是否有角标
-      this.dataList[2].list.forEach(item=>{
-        for(let key in this.toDoMsg){
-          if (key === item.id){
-            item.notice = this.toDoMsg[key]
-          }
-        }
-      })
-      this.dataList[3].list.forEach(item=>{
-        for(let key in this.toDoMsg){
-          if (key === item.id){
-            item.notice = this.toDoMsg[key]
-          }
-        }
-      })
-      //通过权限来判断是否可以点击跳转
-      let userInfo = uni.getStorageSync('vuex')
-      if (userInfo.userData.AuthorityInfo['89a1f248-2113-4d57-84b1-c2e6edb9e8ee']===1){
-          this.isTrue = true
-      }else{
-        this.isTrue = false
-        uni.navigateTo({
-          url:`/pages/commercialBI/noData?type=index`
-        })
       }
-
+      if (item.id === "a927bf4d-f924-4034-b964-d1a8bd401d09") {
-    },
+        item.isNotice = true;
-      onShow(){
+      }
-          uni.hideTabBar()
+    });
-      },
+    //拿到登录用户有权限的内容 判断是否有角标
-    onUnload() {
+    this.dataList[3].list.forEach((item) => {
-       this.$util.addUserBehavior()
+      for (let key in this.user.AuthorityInfo) {
-    },
+        if (key === item.id) {
-		methods:{
+          if (this.user.AuthorityInfo[key] === 1) {
-      ...mapActions(['getTodoList']),
+            item.isNotice = true;
-			toPage(url) {
-        if (this.isTrue === true){
-          this.$util.toNextRoute('navigateTo', url)
-        }else{
-          uni.showToast({
-            title: '暂无权限请联系管理员',
-            icon: 'none'
-          })
-        }
-			},
-      //格式化电话的方法
-      handleGetPhone(value) {
-        return value.substring(0, 3) + '****' + value.substring(7)
-      },
-      handleGoEmpower(){
-        this.$util.toNextRoute('navigateTo', '/pages/register/register')
-      },
-      handleNews(){
-        if (this.special){
-          this.$util.toNextRoute('navigateTo', '/pages/commercialBI/specialCase')
-        }
-      },
-      handleGetWarningList(){
-        const date = new Date()
-        // 拿到当前小时的前一小时
-        let h = date.getHours() - 1
-        const req= {
-          // this.single
-          StatisticsDate: this.lastDay,
-          StatisticsHour:h,
-          StatisticsType:1,
-          ShowCount:20
-        }
-        request.$webGet('CommercialApi/BigData/GetBayonetWarning',req).then(res=>{
-          if (res.Result_Data.List.length>0){
-            this.special = true
           }
-        })
+        }
-      },
+      }
-		},
+    });
-	}
+    //拿到登录用户有权限的内容 判断是否有角标
+    this.dataList[2].list.forEach((item) => {
+      for (let key in this.toDoMsg) {
+        if (key === item.id) {
+          item.notice = this.toDoMsg[key];
+        }
+      }
+    });
+    this.dataList[3].list.forEach((item) => {
+      for (let key in this.toDoMsg) {
+        if (key === item.id) {
+          item.notice = this.toDoMsg[key];
+        }
+      }
+    });
+    //通过权限来判断是否可以点击跳转
+    let userInfo = uni.getStorageSync("vuex");
+    if (
+      userInfo.userData.AuthorityInfo[
+        "89a1f248-2113-4d57-84b1-c2e6edb9e8ee"
+      ] === 1
+    ) {
+      this.isTrue = true;
+    } else {
+      this.isTrue = false;
+      uni.navigateTo({
+        url: `/pages/commercialBI/noData?type=index`,
+      });
+    }
+  },
+  onShow() {
+    uni.hideTabBar();
+  },
+  onUnload() {
+    this.$util.addUserBehavior();
+  },
+  methods: {
+    ...mapActions(["getTodoList"]),
+    toPage(url) {
+      if (this.isTrue === true) {
+        this.$util.toNextRoute("navigateTo", url);
+      } else {
+        uni.showToast({
+          title: "暂无权限请联系管理员",
+          icon: "none",
+        });
+      }
+    },
+    //格式化电话的方法
+    handleGetPhone(value) {
+      return value.substring(0, 3) + "****" + value.substring(7);
+    },
+    handleGoEmpower() {
+      this.$util.toNextRoute("navigateTo", "/pages/register/register");
+    },
+    handleNews() {
+      if (this.special) {
+        this.$util.toNextRoute("navigateTo", "/pages/commercialBI/specialCase");
+      }
+    },
+    handleGetWarningList() {
+      const date = new Date();
+      // 拿到当前小时的前一小时
+      let h = date.getHours() - 1;
+      const req = {
+        // this.single
+        StatisticsDate: this.lastDay,
+        StatisticsHour: h,
+        StatisticsType: 1,
+        ShowCount: 20,
+      };
+      request
+        .$webGet("CommercialApi/BigData/GetBayonetWarning", req)
+        .then((res) => {
+          if (res.Result_Data.List.length > 0) {
+            this.special = true;
+          }
+        });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
@@ -429,16 +513,17 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
     height: 280px;
     background: linear-gradient(315deg, #ff8d95 0%, #ffdca8 100%);
     position: relative;
-    .headerTop{
+    .headerTop {
       width: 100%;
-      background: linear-gradient(260deg, #FEA199 0%, #FFD6A7  100%);
+      background: linear-gradient(260deg, #fea199 0%, #ffd6a7 100%);
       position: fixed;
-      top: 0;left:0;
+      top: 0;
+      left: 0;
       box-sizing: border-box;
       padding: 0 15px;
-      z-index:9999999;
+      z-index: 9999999;
     }
-    .news{
+    .news {
       width: 24px;
       height: 24px;
       position: absolute;
@@ -447,21 +532,22 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
       display: flex;
       justify-content: center;
       align-items: center;
-      .box{
+      .box {
         width: 100%;
         height: 100%;
         position: relative;
-        .img{
+        .img {
           width: 100%;
           height: 100%;
         }
-        .red{
+        .red {
           position: absolute;
           width: 8px;
           height: 8px;
-          background: #D7000F;
+          background: #d7000f;
           border-radius: 50%;
-          right:0;top: 4px;
+          right: 0;
+          top: 4px;
         }
       }
     }
@@ -483,7 +569,7 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
       background-size: cover;
       padding: 16px 0 0 16px;
       position: relative;
-      .userBgImg{
+      .userBgImg {
         position: absolute;
         left: 0;
         top: 0;
@@ -507,7 +593,7 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
           }
         }
         .message {
-          flex:1;
+          flex: 1;
           .people {
             display: flex;
             align-items: center;
@@ -526,7 +612,7 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
               border-radius: 5px;
               overflow: hidden;
               padding: 0 5px;
-              border:1px solid #FEA001;
+              border: 1px solid #fea001;
               //background: linear-gradient(134deg, rgba(255, 165, 0, 1), rgba(220, 55, 7, 1));
               .personName {
                 display: flex;
@@ -565,7 +651,11 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
       .other {
         width: 100%;
         height: 40px;
-        background: linear-gradient(315deg, rgba(255, 141, 149, 0.2), rgba(255, 220, 168, 0.2));
+        background: linear-gradient(
+          315deg,
+          rgba(255, 141, 149, 0.2),
+          rgba(255, 220, 168, 0.2)
+        );
         display: flex;
         align-items: center;
         justify-content: space-between;
@@ -592,7 +682,7 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
           }
         }
         .item:first-child:after {
-          content: '';
+          content: "";
           width: 1px;
           height: 24px;
           background: #782717;
@@ -611,7 +701,7 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
     padding: 24px 16px calc(env(safe-area-inset-bottom) + 82px) 16px;
     position: relative;
     border-radius: 32rpx 32rpx 2rpx 2rpx;
-    .main{
+    .main {
       .title {
         font-size: 34rpx;
         font-family: PingFangSC-Semibold, PingFang SC;
@@ -648,13 +738,13 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
           }
         }
         .firstBg_1 {
-          background: url('https://eshangtech.com/ShopICO/ahyd-BID/index/firstBg_1.png');
+          background: url("https://eshangtech.com/ShopICO/ahyd-BID/index/firstBg_1.png");
         }
         .firstBg_2 {
-          background: url('https://eshangtech.com/ShopICO/ahyd-BID/index/firstBg_2.png');
+          background: url("https://eshangtech.com/ShopICO/ahyd-BID/index/firstBg_2.png");
         }
         .firstBg_3 {
-          background: url('https://eshangtech.com/ShopICO/ahyd-BID/index/firstBg_3.png');
+          background: url("https://eshangtech.com/ShopICO/ahyd-BID/index/firstBg_3.png");
         }
       }
       .second {

static/images/index/guest.svg

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>商业bi/车流画像备份_3@2x</title>
-    <defs>
-        <linearGradient x1="-1.11022302e-14%" y1="50%" x2="100%" y2="50%" id="linearGradient-1">
-            <stop stop-color="#30C8ED" offset="0%"></stop>
-            <stop stop-color="#0B9353" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="100%" y1="50%" x2="0%" y2="50%" id="linearGradient-2">
-            <stop stop-color="#30C8ED" offset="0%"></stop>
-            <stop stop-color="#0B9353" offset="100%"></stop>
-        </linearGradient>
-        <path d="M17,18 C18.6568542,18 20,19.3431458 20,21 L20,22 L12,22 L12,21 C12,19.3431458 13.3431458,18 15,18 L17,18 Z M16,13 C17.1045695,13 18,13.8954305 18,15 C18,16.1045695 17.1045695,17 16,17 C14.8954305,17 14,16.1045695 14,15 C14,13.8954305 14.8954305,13 16,13 Z" id="path-3"></path>
-        <filter x="-75.0%" y="-66.7%" width="250.0%" height="233.3%" filterUnits="objectBoundingBox" id="filter-4">
-            <feOffset dx="0" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0.0549019608   0 0 0 0 0.592156863   0 0 0 0 0.368627451  0 0 0 1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
-        </filter>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-5">
-            <stop stop-color="#C3F4FF" offset="0%"></stop>
-            <stop stop-color="#B9FFEC" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-6">
-            <stop stop-color="#C3F4FF" offset="0%"></stop>
-            <stop stop-color="#B9FFEC" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="驿达小程序-首页0311" transform="translate(-259.000000, -2228.000000)">
-            <g id="编组-32" transform="translate(115.000000, 2228.000000)">
-                <g id="编组" transform="translate(144.000000, 0.000000)">
-                    <circle id="椭圆形" fill="url(#linearGradient-1)" cx="16" cy="16" r="15"></circle>
-                    <path d="M15.0008365,1.03285964 C22.8184728,1.5478546 29,8.05204078 29,16 C29,23.9479592 22.8184728,30.4521454 15.0008365,30.9671404 C7.18205513,30.4527008 1,23.9482986 1,16 C1,8.13518552 7.05287201,1.68409506 14.7543616,1.05098303 Z" id="形状结合" fill="url(#linearGradient-2)"></path>
-                    <g id="形状结合">
-                        <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-3"></use>
-                        <use fill="#EAFBFF" fill-rule="evenodd" xlink:href="#path-3"></use>
-                    </g>
-                    <rect id="矩形" fill="url(#linearGradient-5)" transform="translate(22.303301, 22.303301) rotate(-45.000000) translate(-22.303301, -22.303301) " x="21.3033009" y="19.8033009" width="2" height="5" rx="1"></rect>
-                    <circle id="椭圆形" stroke="url(#linearGradient-6)" stroke-width="2" cx="16" cy="16" r="7"></circle>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

static/images/index/purchaseAmount.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>首页图标/本月计划备份_2@2x</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="驿达小程序-首页0311" transform="translate(-315.000000, -2176.000000)">
-            <g id="分润门店" transform="translate(315.000000, 2176.000000)">
-                <rect id="矩形" stroke="#EDDFDF" stroke-width="2" x="8" y="3" width="9" height="11" rx="4.5"></rect>
-                <rect id="矩形" fill="#E3D2D2" x="2" y="9" width="21" height="20" rx="2"></rect>
-                <circle id="椭圆形" fill="#DF6866" cx="24.02" cy="22.02" r="7.02"></circle>
-                <path d="M9.5,14 C9.5,15.6568542 10.8431458,17 12.5,17 C14.1568542,17 15.5,15.6568542 15.5,14" id="路径" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
-                <path d="M23.000061,15.0735562 L23,27 C23,27.7460616 22.5914971,28.3967122 21.9859636,28.7404796 C19.1004411,27.8683451 17,25.1894647 17,22.02 C17,18.4893739 19.6064063,15.5675067 23.000061,15.0735562 Z" id="形状结合" fill="#92066B"></path>
-                <path d="M24.02,17.4540667 C24.3182338,17.4540667 24.56,17.6958329 24.56,17.9940667 L24.56,18.6010667 L25.613,18.6015667 C25.9261455,18.6015667 26.18,18.8554213 26.18,19.1685667 L26.18,19.1820667 C26.18,19.4952122 25.9261455,19.7490667 25.613,19.7490667 L23.66,19.7490667 C23.2804298,19.7490667 22.9694606,20.06114 22.9419749,20.4569739 L22.94,20.5140667 L22.94,20.7053167 C22.94,21.1086101 23.233716,21.4390149 23.6062656,21.4682184 L23.66,21.4703167 L24.739,21.4695667 L24.7400138,21.5085766 C25.5616134,21.6857832 26.18,22.4575705 26.18,23.3828167 L26.18,23.5740667 C26.18,24.565435 25.4700701,25.3806269 24.5609067,25.4770278 L24.56,26.0940667 C24.56,26.3923005 24.3182338,26.6340667 24.02,26.6340667 C23.7217662,26.6340667 23.48,26.3923005 23.48,26.0940667 L23.48,25.4860667 L22.427,25.4865667 C22.1138545,25.4865667 21.86,25.2327122 21.86,24.9195667 L21.86,24.9060667 C21.86,24.5929213 22.1138545,24.3390667 22.427,24.3390667 L22.733,24.3390667 L22.746,24.3405667 L24.38,24.3390667 C24.7595702,24.3390667 25.0705394,24.0269934 25.0980251,23.6311596 L25.1,23.5740667 L25.1,23.3828167 C25.1,22.9795233 24.806284,22.6491185 24.4337344,22.619915 L24.38,22.6178167 L23.301,22.61862 L23.3009863,22.5797722 C22.4788884,22.4029764 21.86,21.6309383 21.86,20.7053167 L21.86,20.5140667 C21.86,19.522334 22.570452,18.7069071 23.4800961,18.6109996 L23.48,17.9940667 C23.48,17.6958329 23.7217662,17.4540667 24.02,17.4540667 Z" id="形状结合" fill="#FFFFFF"></path>
-            </g>
-        </g>
-    </g>
-</svg>

static/images/index/yidaFenrun.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>首页图标/本月计划备份_17@2x</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="驿达小程序-首页0311" transform="translate(-363.000000, -2176.000000)">
-            <g id="首页图标/本月计划备份-17" transform="translate(363.000000, 2176.000000)">
-                <g id="编组-3" transform="translate(0.000000, 3.000000)">
-                    <circle id="椭圆形" fill="#E3D2D2" cx="13" cy="13" r="13"></circle>
-                    <path d="M12.6666667,5.375 C13.1499158,5.375 13.5416667,5.76675084 13.5416667,6.25 L13.5416667,7.25 L15.2291667,7.25 C15.7469336,7.25 16.1666667,7.66973305 16.1666667,8.1875 C16.1666667,8.70526695 15.7469336,9.125 15.2291667,9.125 L14.9996667,9.124 L14.9996667,9.125 L12.0833333,9.125 C11.468289,9.125 10.9644037,9.63492362 10.9198667,10.281711 L10.9166667,10.375 L10.9166667,10.6875 C10.9166667,11.3464761 11.3925954,11.8863532 11.9962636,11.9340714 L12.0833333,11.9375 L13.8326667,11.937 L13.8333159,12.0000075 C15.1646314,12.2895443 16.1666667,13.5506447 16.1666667,15.0625 L16.1666667,15.375 C16.1666667,16.9951189 15.015982,18.3272841 13.5424917,18.4844823 L13.5416667,19.5 C13.5416667,19.9832492 13.1499158,20.375 12.6666667,20.375 C12.1834175,20.375 11.7916667,19.9832492 11.7916667,19.5 L11.7916667,18.499 L10.1041667,18.5 C9.58639971,18.5 9.16666667,18.080267 9.16666667,17.5625 C9.16666667,17.044733 9.58639971,16.625 10.1041667,16.625 L13.25,16.625 C13.8650444,16.625 14.3689297,16.1150764 14.4134667,15.468289 L14.4166667,15.375 L14.4166667,15.0625 C14.4166667,14.4035239 13.940738,13.8636468 13.3370697,13.8159286 L13.25,13.8125 L11.5006667,13.813 L11.5000175,13.7499925 C10.1687019,13.4604557 9.16666667,12.1993553 9.16666667,10.6875 L9.16666667,10.375 C9.16666667,8.75451636 10.3178695,7.42211611 11.7918368,7.26541167 L11.7916667,6.25 C11.7916667,5.76675084 12.1834175,5.375 12.6666667,5.375 Z" id="形状结合" fill="#FFFFFF"></path>
-                    <path d="M23,11.5 C23,10.1192881 24.1192881,9 25.5,9 C26.8807119,9 28,10.1192881 28,11.5 L28,12 L29.630178,12 C30.4059829,12 31.0537798,12.5915776 31.1240179,13.3641964 L31.8512906,21.3641964 C31.9262928,22.1892213 31.3182793,22.9188375 30.4932544,22.9938398 C30.4481029,22.9979445 30.4027885,23 30.3574508,23 L20.6425492,23 C19.8141221,23 19.1425492,22.3284271 19.1425492,21.5 C19.1425492,21.4546623 19.1446047,21.4093479 19.1487094,21.3641964 L19.8759821,13.3641964 C19.9462202,12.5915776 20.5940171,12 21.369822,12 L23,12 L23,11.5 Z" id="形状结合" fill="#1FB6C3"></path>
-                    <path d="M25.3743318,9.00412115 C25.7805581,10.2630557 26,11.6059011 26,13 C26,17.0210992 24.1743311,20.6157906 21.3066705,23.0003971 L20.6425492,23 C19.8141221,23 19.1425492,22.3284271 19.1425492,21.5 C19.1425492,21.4546623 19.1446047,21.4093479 19.1487094,21.3641964 L19.8759821,13.3641964 C19.9462202,12.5915776 20.5940171,12 21.369822,12 L23,12 L23,11.5 C23,10.1745166 24.0315359,9.08996133 25.3356243,9.00531768 Z" id="形状结合" fill="#057962"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

static/images/tabBar/user_active.svg

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>首页@3x</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="驿达小程序-个人中心0311" transform="translate(-188.000000, -1626.000000)">
-            <g id="编组" transform="translate(188.000000, 1626.000000)">
-                <path d="M12,2.5 C13.3807119,2.5 14.6307119,3.05964406 15.5355339,3.96446609 C16.4403559,4.86928813 17,6.11928813 17,7.5 C17,8.88071187 16.4403559,10.1307119 15.5355339,11.0355339 C14.6307119,11.9403559 13.3807119,12.5 12,12.5 C10.6192881,12.5 9.36928813,11.9403559 8.46446609,11.0355339 C7.55964406,10.1307119 7,8.88071187 7,7.5 C7,6.11928813 7.55964406,4.86928813 8.46446609,3.96446609 C9.36928813,3.05964406 10.6192881,2.5 12,2.5 Z" id="椭圆形" stroke="#D7000F" stroke-width="2"></path>
-                <rect id="矩形" fill="#D7000F" opacity="0.5" x="10" y="5.5" width="1.5" height="3" rx="0.75"></rect>
-                <rect id="矩形备份" fill="#D7000F" opacity="0.5" x="13" y="5.5" width="1.5" height="3" rx="0.75"></rect>
-                <path d="M16.9688711,15.5 C17.8681781,15.5 18.6971182,15.8348275 19.3291179,16.3927455 C19.9611176,16.9506636 20.3961768,17.7316723 20.5077221,18.6240347 L20.5077221,18.6240347 L20.7267134,20.3759653 C20.7609647,20.6499752 20.6809089,20.9119278 20.5237878,21.1139406 C20.376461,21.3033607 20.1613774,21.4400811 19.9092393,21.4846273 L19.9092393,21.4846273 L4.26556444,21.5 C3.98942206,21.5 3.73942206,21.3880712 3.55845766,21.2071068 C3.38815575,21.0368049 3.27899389,20.8053629 3.26672139,20.5485303 L3.26672139,20.5485303 L3.49227788,18.6240347 C3.60382318,17.7316723 4.03888243,16.9506636 4.6708821,16.3927455 C5.30288177,15.8348275 6.13182186,15.5 7.03112887,15.5 L7.03112887,15.5 Z" id="矩形" stroke="#D7000F" stroke-width="2"></path>
-            </g>
-        </g>
-    </g>
-</svg>

static/images/tabBar/user_normal.svg

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>首页备份@3x</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="驿达小程序-个人中心0311" transform="translate(-228.000000, -1626.000000)">
-            <g id="编组" transform="translate(228.000000, 1626.000000)">
-                <path d="M12,2.5 C13.3807119,2.5 14.6307119,3.05964406 15.5355339,3.96446609 C16.4403559,4.86928813 17,6.11928813 17,7.5 C17,8.88071187 16.4403559,10.1307119 15.5355339,11.0355339 C14.6307119,11.9403559 13.3807119,12.5 12,12.5 C10.6192881,12.5 9.36928813,11.9403559 8.46446609,11.0355339 C7.55964406,10.1307119 7,8.88071187 7,7.5 C7,6.11928813 7.55964406,4.86928813 8.46446609,3.96446609 C9.36928813,3.05964406 10.6192881,2.5 12,2.5 Z" id="椭圆形" stroke="#A69E9F" stroke-width="2"></path>
-                <rect id="矩形" fill="#A69E9F" opacity="0.5" x="10" y="5.5" width="1.5" height="3" rx="0.75"></rect>
-                <rect id="矩形备份" fill="#A69E9F" opacity="0.5" x="13" y="5.5" width="1.5" height="3" rx="0.75"></rect>
-                <path d="M16.9688711,15.5 C17.8681781,15.5 18.6971182,15.8348275 19.3291179,16.3927455 C19.9611176,16.9506636 20.3961768,17.7316723 20.5077221,18.6240347 L20.5077221,18.6240347 L20.7267134,20.3759653 C20.7609647,20.6499752 20.6809089,20.9119278 20.5237878,21.1139406 C20.376461,21.3033607 20.1613774,21.4400811 19.9092393,21.4846273 L19.9092393,21.4846273 L4.26556444,21.5 C3.98942206,21.5 3.73942206,21.3880712 3.55845766,21.2071068 C3.38815575,21.0368049 3.27899389,20.8053629 3.26672139,20.5485303 L3.26672139,20.5485303 L3.49227788,18.6240347 C3.60382318,17.7316723 4.03888243,16.9506636 4.6708821,16.3927455 C5.30288177,15.8348275 6.13182186,15.5 7.03112887,15.5 L7.03112887,15.5 Z" id="矩形" stroke="#A69E9F" stroke-width="2"></path>
-            </g>
-        </g>
-    </g>
-</svg>

util/api.js

@@ -19,8 +19,7 @@ export default {
 	 * +-------------------
 	 * @return {Promise}    promise 返回promise供后续操作
 	 */
-	request: function(method, url, data, isWebApi) {
+	request: function (method, url, data, isWebApi) {
-
 		var promise = new Promise((resolve, reject) => {
 			//init
 			Store.state.isLoading = true
@@ -35,8 +34,6 @@ export default {
 
 			data.memberShipId = !data.memberShipId ? (Store.state.userData.Membership_Id || '') :
 				data.memberShipId // ||'3255' 1170386 1125717 //
-
-
 			let requstOptions = {
 				url: url,
 				data: data,
@@ -44,37 +41,37 @@ export default {
 			}
 			let ModuleGuid = ''
 			let obj = Store.state.userData.AuthorityInfo
-			for (let key in obj){
+			for (let key in obj) {
 				//  经管  财务
-				if (key==='f0889950-f98a-40de-a369-613efeed2579' || key==='c021bbca-3c0a-478d-81e7-87e81ef80e05' ){
+				if (key === 'f0889950-f98a-40de-a369-613efeed2579' || key === 'c021bbca-3c0a-478d-81e7-87e81ef80e05') {
-					if (obj[key]===1){
+					if (obj[key] === 1) {
-						if (ModuleGuid===''){
+						if (ModuleGuid === '') {
 							ModuleGuid = key
-						}else{
+						} else {
-							ModuleGuid +=`,${key}`
+							ModuleGuid += `,${key}`
 						}
 					}
 				}
 			}
-
 			if (method == 'POST' && !isWebApi) {
 				requstOptions.header = {
 					'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
-					'ServerpartCodes':Store.state.userData.UserCityAuthority,
+					'ServerpartCodes': Store.state.userData.UserCityAuthority,
 					'ProvinceCode': Store.state.userData.ProvinceCode,
-					'ModuleGuid':ModuleGuid,
+					'ModuleGuid': ModuleGuid,
-					'WeChat_AppId' : 'wxa99ef047735c031e',
+					'WeChat_AppId': 'wxa99ef047735c031e',
-					'memberShipId' : !data.memberShipId ? (Store.state.userData.Membership_Id || '') :data.memberShipId,
+					'memberShipId': !data.memberShipId ? (Store.state.userData.Membership_Id || '') : data.memberShipId,
 					'SourcePlatform': 'minProgram'
 				}
-			}else{
+			} else {
 				requstOptions.header = {
-					'ServerpartCodes':Store.state.userData.UserCityAuthority,
+					'ServerpartCodes': Store.state.userData.UserCityAuthority,
 					'ProvinceCode': Store.state.userData.ProvinceCode,
-					'ModuleGuid':ModuleGuid,
+					'ModuleGuid': ModuleGuid,
-					'WeChat_AppId' : 'wxa99ef047735c031e',
+					'WeChat_AppId': 'wxa99ef047735c031e',
-					'memberShipId' : !data.memberShipId ? (Store.state.userData.Membership_Id || '') :data.memberShipId,
+					'memberShipId': !data.memberShipId ? (Store.state.userData.Membership_Id || '') : data.memberShipId,
-					'SourcePlatform': 'minProgram'
+					'SourcePlatform': 'minProgram',
+					"UserId": Store.state.userData.UserId,
 				}
 			}
 			requstOptions.success = (res) => {
@@ -82,7 +79,7 @@ export default {
 				//服务器返回数据
 				if (res && (res.statusCode === 200 || res.statusCode === 304 || res.statusCode === 400)) {
 					if (res.data && ((res.data.ResultCode != '999' && res.data.ResultCode != undefined) ||
-						(res.data.Result_Code != '999' && res.data.Result_Code != undefined))) {
+							(res.data.Result_Code != '999' && res.data.Result_Code != undefined))) {
 						resolve(res.data);
 					} else if (typeof res.data == 'object') { // 兼容招标投标模块
 						resolve(res.data);
@@ -118,7 +115,7 @@ export default {
 			}
 			//网络请求
 			uni.request(requstOptions)
-		}).catch(function(reason, request) {
+		}).catch(function (reason, request) {
 
 			uni.showToast({
 				title: reason,