首页菜单bug+图标

App.vue

@@ -36,7 +36,7 @@ button::after {
 /**挂载iconfont字体图标*/
 @font-face {
 	font-family: 'iconfont';
-	src: url('https://at.alicdn.com/t/c/font_4191999_7iv6g88ty2h.ttf?t=1693811980958') format('truetype');
+	src: url('https://at.alicdn.com/t/c/font_4666493_zepght549b.ttf?t=1724837382464') format('truetype');
 	 // src: url('~@/static/font/iconfont.woff2?t=1724655869789') format('woff2')
 	 //       url('~@/static/font/iconfont.woff?t=1724655869789') format('woff'),
 	 //       url('~@/static/font/iconfont.ttf?t=1724655869789') format('truetype');
@@ -44,5 +44,5 @@ button::after {
 
 .icon {
 	font-family: iconfont;
-}
+} 
 </style>

common/http.js

@@ -1,9 +1,11 @@
 
 // const ip = 'http://192.168.2.8:8080'; //线下
 //const ip = 'http://hs-server.aseanbusiness.cn'; //线上
-const ngip = 'http://hs.tbgjhc.top:7010'
+// const ngip = 'http://hs.tbgjhc.top:7010'
 const ip = 'http://hs-server.tbgjhc.top:8018';
-// const ip = 'http:///192.168.31.251:8080'; //线下
+//静态图片地址前缀
+// const ngip = 'http://192.168.3.15:8080/sp-admin'
+// const ip = 'http:///192.168.3.15:8080'; //线下
 
 /**
  * 封装的http请求
@@ -92,7 +94,6 @@ const request = (opt) => {
 	})
 }
 module.exports = {
-	ngip,
 	ip,
 	request
 };

pages/index/index.vue

@@ -36,7 +36,7 @@
 					<view class="msn" @click="go('/pages/market/one/leader/order')">
 						<view class="out">
 							<view class="int">
-								<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
+								<view class="icon ioc" style="background-color: #00aaff; color: #ffffff">&#xe6e9;</view>
 								<view class="tit">一级市场交易</view>
 							</view>
 						</view>
@@ -44,7 +44,7 @@
 					<view class="msn" @click="go('/pages/market/two/leader/order')">
 						<view class="out">
 							<view class="int">
-								<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
+								<view class="icon ioc" style="background-color: #00aaff; color: #ffffff">&#xe606;</view>
 								<view class="tit">二级市场交易</view>
 							</view>
 						</view>
@@ -52,7 +52,7 @@
 					<view class="msn" @click="go('/pages/market/order/order')">
 						<view class="out">
 							<view class="int">
-								<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
+								<view class="icon ioc" style="background-color: #00aaff; color: #aaffff">&#xe612;</view>
 								<view class="tit">商品上架</view>
 							</view>
 						</view>
@@ -308,7 +308,7 @@
 						menu.map((item2, index1) => {
 							data.map((item1, index) => {
 								if (parseInt(item1.id) == parseInt(item2)) {
-									item1.icon = this.http.ngip + item1.icon
+									item1.icon =item1.icon
 									this.menuList.push(item1);
 								}
 							});

pages/market/one/confirm/apply.vue

@@ -3,7 +3,8 @@
 		<mcalendar v-model="show" @confirm="confirm" @clear="clear" @today="today"></mcalendar>
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
-				<view class="title">{{ item.enterpriseName }}
+				<view class="title">
+				<view style="font-size: 14px;">{{ item.enterpriseName }}</view>
 					<view class="state" v-if="item.applyConfirmStatus == 0">
 						<text class="icon">&#xe830;</text>
 						<text>未确认</text>

pages/market/one/confirm/cooperation.vue

@@ -4,7 +4,7 @@
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<view class="title">
-					{{ item.enterpriseName }}
+					<view style="font-size: 14px;">{{ item.enterpriseName }}</view>
 					<view class="state" v-if="item.cooperEntrustStatus == 0">
 						<text class="icon">&#xe830;</text>
 						<text>未确认</text>
@@ -15,7 +15,6 @@
 					</view>
 				</view>
 
-				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
 					<view class="productName omit">{{ item.goodsNames }}</view>
 					<view class="desc omit">

pages/market/one/confirm/people.vue

@@ -3,7 +3,8 @@
 		<mcalendar v-model="show" @confirm="confirm" @clear="clear" @today="today"></mcalendar>
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
-				<view class="title">{{ item.enterpriseName }}
+				<view class="title">
+				<view style="font-size: 14px;">{{ item.enterpriseName }}</view>
 					<view class="state" v-if="item.peopleConfirmStatus == 0">
 						<text class="icon">&#xe830;</text>
 						<text>未确认</text>

pages/market/one/leader/handleThree.vue

@@ -239,10 +239,12 @@ export default {
 				this.current = 2;
 				this.getData2();
 			}
+			console.log('load:=====',+this.current)
 		}
-		
+
 		//人脸认证回调
 		uni.$on('face',res=>{
+			console.log('current:=====',+this.current)
 			this.confirmFn()
 		})
 	},
@@ -268,8 +270,9 @@ export default {
 					method: 'POST',
 					data: { cfgName: 'cooper_entrust_cfg' },
 					success: res => {
+
 						this.cooper_entrust = JSON.parse(res.data.data).cooper_entrust
-						
+
 						if(this.cooper_entrust == 1) {
 							console.log("---1---this.imgList.length="+this.imgList.length)
 							if(this.imgList.length == 0) {
@@ -308,19 +311,18 @@ export default {
 								}
 							}
 						}
+            this.http.request({
+              url: '/level-one-server/app/TbOrder/cooperOrder',
+              method: 'POST',
+              data: { orderId: this.orderId },
+              success: res => {
+                uni.showToast({ title: '互助委托确认成功' });
+                this.current = 2;
+                uni.setNavigationBarTitle({ title: '进口申报确认' });
+              }
+            });
 					}
 				})
-				
-				this.http.request({
-					url: '/level-one-server/app/TbOrder/cooperOrder',
-					method: 'POST',
-					data: { orderId: this.orderId },
-					success: res => {
-						uni.showToast({ title: '互助委托确认成功' });
-						this.current = 2;
-						uni.setNavigationBarTitle({ title: '进口申报确认' }); 
-					}
-				});
 			}
 			if (this.current == 2){
 				 this.http.request({
@@ -364,7 +366,6 @@ export default {
 					content: '我已核对信息无误',
 					success: res => {
 						if (res.confirm) {
-							this.confirmFn();
 							//return;
 							//跳转到人脸认证
 							uni.navigateTo({url:'/pages/face/faceRegister?type=2'})
@@ -378,7 +379,6 @@ export default {
 					content: '我已核对信息无误',
 					success: res => {
 						if (res.confirm) {
-							this.confirmFn();
 							//return;
 				          //跳转到人脸认证
 				          uni.navigateTo({url:'/pages/face/faceRegister?type=2'})

pages/market/one/leader/order.vue

@@ -11,7 +11,12 @@
 						<text class="icon">&#xe830;</text>
 						<text>未过卡3</text>
 					</view>
-					<view class="state" v-if="item.finishStatus == 1 && item.upStatus == 1">
+					<view class="state"
+						v-if="item.finishStatus == 1">
+						<text class="icon">&#xe830;</text>
+						<text>已过卡3</text>
+					</view>
+				<!-- 	<view class="state" v-if="item.finishStatus == 1 && item.upStatus == 1">
 						<text class="icon" style="color:#13ce66">&#xe830;</text>
 						<text>待上架</text>
 					</view>
@@ -22,7 +27,7 @@
 					<view class="state" v-if="item.resaleStatus == 1&& item.upStatus == 2">
 						<text class="icon" style="color: #13ce66">&#xe830;</text>
 						<text>已转售</text>
-					</view>
+					</view> -->
 				</view>
 
 				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
@@ -66,27 +71,12 @@
 					{
 						name: '未过卡3',
 						finishStatus: 0,
-						resaleStatus: 0,
-						upStatus: 1
 					},
 					{
-						name: '待上架',
-						finishStatus: 1,
-						resaleStatus: 0,
-						upStatus: 1
-					},
-					{
-						name: '已上架',
+						name: '未过卡3',
 						finishStatus: 1,
-						resaleStatus: 0,
-						upStatus: 2
+					
 					},
-					{
-						name: '已转售',
-						finishStatus: 1,
-						resaleStatus: 1,
-						upStatus: 2
-					}
 				],
 				param: {
 					pageNo: 1,