更新接单

App.vue

@@ -50,7 +50,7 @@ button::after {
 /**挂载iconfont字体图标*/
 @font-face {
 	font-family: 'iconfont';
-	src: url('https://at.alicdn.com/t/c/font_4191999_z2jzykzkv2.ttf?t=1691430428769') format('truetype');
+	src: url('https://at.alicdn.com/t/c/font_4191999_e7zpht1k18.ttf?t=1691493310275') format('truetype');
 	/* src: url('~@/static/font/iconfont.ttf') format('truetype'); */
 }
 .icon {

pages.json

@@ -220,15 +220,7 @@
 			"path": "pages/market/one/merchant/goods/add",
 			"style": {
 				"navigationBarTitleText": "新增商品",
-				"enablePullDownRefresh": false,
-				"app-plus": {
-					"titleNView": {
-						"buttons": [{
-							"text": "保存",
-							"fontSize": "14px"
-						}]
-					}
-				}
+				"enablePullDownRefresh": false
 			}
 
 		}, {

pages/market/one/list.vue

@@ -18,11 +18,11 @@
 				<view class="clear"></view>
 			</view>
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item.id)">
-				<view class="title">广西京东自营店南宁分店</view>
+				<view class="title">{{item.merchantName}}</view>
 				<image src="../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
 					<view class="productName omit">{{ item.goodsName }}</view>
-					<view class="desc">
+					<view class="desc omit">
 						<text>{{item.grossWeight}} {{item.goodsUnits}}</text>
 						<text>{{ item.tradeAreaName }}</text>
 					</view>

pages/market/one/merchant/goods/add.vue

@@ -136,6 +136,9 @@ export default {
 </script>
 
 <style lang="scss">
+.cmain {
+	padding-bottom: 90px;
+}
 .btn {
 	width: 100%;
 	border-radius: 5px;

pages/market/two/leader/order.vue

@@ -61,7 +61,7 @@ export default {
 	methods: {
 		getData() {
 			this.http.request({
-				url: '/level-one-server/app/TbGoodsTransit/getTransitList',
+				url: '/level-two-server/app/TbOrders/getList',
 				loading: 'false',
 				data: this.param,
 				success: res => {

pages/market/two/purchaser/buy/add.vue

@@ -167,6 +167,9 @@ export default {
 </script>
 
 <style lang="scss">
+.cmain {
+	padding-bottom: 90px;
+}
 .address {
 	border-bottom: 1px solid $line;
 }

pages/message/message.vue

@@ -11,6 +11,8 @@
 				<view class="content">订单20210803172489305已支付，请尽快与对方联系!</view>
 				<view class="clear"></view>
 			</view>
+			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
+			<u-empty v-if="!loadMore && list.length == 0"></u-empty>
 		</view>
 	</view>
 </template>
@@ -99,11 +101,11 @@ page {
 				float: left;
 				font-weight: bold;
 				padding-left: 7px;
-				color: #192B20;
+				color: #192b20;
 			}
 			.date {
 				float: right;
-				color: #A0A2A6;
+				color: #a0a2a6;
 			}
 		}
 		.content {

pages/personal/personal.vue

@@ -95,27 +95,22 @@
 			</view>
 			<view class="cmd">
 				<view class="s_item" @click="show = true">
-					<text class="icon ic">&#xe686;</text>
+					<text class="icon ic">&#xe8bb;</text>
 					<text class="title">常见问题</text>
 					<text class="icon arrow">&#xe8f2;</text>
 				</view>
 				<view class="s_item" @click="show = true">
-					<text class="icon ic">&#xe686;</text>
-					<text class="title">联系我们</text>
-					<text class="icon arrow">&#xe8f2;</text>
-				</view>
-				<view class="s_item" @click="show = true">
-					<text class="icon ic">&#xe686;</text>
+					<text class="icon ic">&#xe662;</text>
 					<text class="title">用户协议</text>
 					<text class="icon arrow">&#xe8f2;</text>
 				</view>
 				<view class="s_item" @click="show = true">
-					<text class="icon ic">&#xe686;</text>
+					<text class="icon ic">&#xe643;</text>
 					<text class="title">隐私协议</text>
 					<text class="icon arrow">&#xe8f2;</text>
 				</view>
 				<view class="s_item" @click="show = true">
-					<text class="icon ic">&#xe686;</text>
+					<text class="icon ic">&#xe817;</text>
 					<text class="title">设置</text>
 					<text class="icon arrow">&#xe8f2;</text>
 				</view>
@@ -220,6 +215,6 @@ page {
 .exit {
 	margin-top: 20px;
 	background-color: white;
-	color: $main-color;
+	color: #F44336;
 }
 </style>