优化

2024-05-11 14:23:35 +08:00 · 2024-05-11 14:23:35 +08:00 · e5b880933c
parent 895ad285b1
commit e5b880933c
7 changed files with 516 additions and 539 deletions
--- a/components/content-top/index.vue
+++ b/components/content-top/index.vue
@ -2,23 +2,20 @@
 	<view class="contentgb">
 		<view class="return_top">
 			<view class="z-bootm-img1" @click="returnbom()">
-				<image src="@/static/images/fb1.png" mode="aspectFit"></image>
+				<u-image width="40rpx" height="14rpx" src="@/static/images/fb1.png" mode="widthFit"></u-image>
 			</view>
 			<view class="z-bootm-l"></view>
 			<view class="z-bootm-img2" @click="returnbom()">
-				<image src="@/static/images/fb2.png" mode="aspectFit"></image>
+				<u-image width="38rpx" height="38rpx" src="@/static/images/fb2.png" mode="widthFit"></u-image>
 			</view>
 		</view>
 	</view>
-
 </template>

 <script>
 	export default {
 		data() {
-			return {
-
-			}
+			return {}
 		},
 		methods: {
 			returnbom() {
@ -34,58 +31,25 @@

 <style lang="scss" scoped>
 	.contentgb {
-
 		width: 166rpx;
 		height: 56rpx;

 		.return_top {
+			display: flex;
+			justify-content: center;
+			align-items: center;
 			width: 166rpx;
 			height: 56rpx;
 			background: rgba(255, 255, 255, 0.6);
 			border-radius: 44rpx 44rpx;
-
 			position: relative;

-			.z-bootm-img1 {
-				width: 41rpx;
-				height: 13rpx;
-
-				position: absolute;
-				top: 5rpx;
-				left: 25rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
 			.z-bootm-l {
 				width: 1px;
 				height: 32rpx;
 				background: rgba(0, 0, 0, 0.2);
-				margin: auto 0;
-
-				position: absolute;
-				top: 10rpx;
-				left: 85rpx;
+				margin: 0 16rpx;
 			}
-
-			.z-bootm-img2 {
-				width: 38rpx;
-				height: 38rpx;
-				margin-top: -15rpx;
-				margin-left: -15rpx;
-				position: absolute;
-				right: 25rpx;
-				top: 25rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
 		}
 	}
 </style>
--- a/manifest.json
+++ b/manifest.json
@ -1,52 +1,52 @@
 {
-	"name": "惠农商户平台",
-	"appid": "__UNI__7626C0F",
-	"description": "",
-	"versionName": "1.5.0",
-	"versionCode": 1500,
-	"transformPx": false,
+    "name" : "惠农商户平台",
+    "appid" : "__UNI__7626C0F",
+    "description" : "",
+    "versionName" : "1.5.0",
+    "versionCode" : 1500,
+    "transformPx" : false,
    /* 5+App特有相关 */
-	"app-plus": {
-		"titleNView": true,
-		"usingComponents": true,
-		"nvueCompiler": "uni-app",
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"compatible": {
-			"ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
+    "app-plus" : {
+        "titleNView" : true,
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "compatible" : {
+            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
        },
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
        },
        /* 模块配置 */
-		"modules": {
-			"VideoPlayer": {},
-			"iBeacon": {},
-			"Barcode": {},
-			"Camera": {},
-			"Geolocation": {},
-			"Payment": {},
-			"Share": {},
-			"OAuth": {},
-			"UniMP": {
-				"description": "uni小程序"
+        "modules" : {
+            "VideoPlayer" : {},
+            "iBeacon" : {},
+            "Barcode" : {},
+            "Camera" : {},
+            "Geolocation" : {},
+            "Payment" : {},
+            "Share" : {},
+            "OAuth" : {},
+            "UniMP" : {
+                "description" : "uni小程序"
            },
-			"Maps": {}
+            "Maps" : {}
        },
-		"safearea": {
-			"bottom": {
-				"offset": "none"
+        "safearea" : {
+            "bottom" : {
+                "offset" : "none"
            }
        },
        /* 应用发布信息 */
-		"distribute": {
+        "distribute" : {
            /* android打包配置 */
-			"android": {
-				"resizeableActivity": true,
-				"permissions": [
+            "android" : {
+                "resizeableActivity" : true,
+                "permissions" : [
                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
@ -70,148 +70,149 @@
                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                ],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
-				"permissionExternalStorage": {
-					"request": "none",
-					"prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
                },
-				"permissionPhoneState": {
-					"request": "none" //拨打电话权限关闭
+                "permissionPhoneState" : {
+                    "request" : "none" //拨打电话权限关闭
                }
            },
            /* ios打包配置 */
-			"ios": {
-				"privacyDescription": {
-					"NSPhotoLibraryUsageDescription": "上传用户头像保存分享海报",
-					"NSPhotoLibraryAddUsageDescription": "上传用户头像保存分享海报",
-					"NSCameraUsageDescription": "上传用户头像保存分享海报",
-					"NSLocationWhenInUseUsageDescription": "根据客户地理位置推荐最近门店",
-					"NSLocationAlwaysUsageDescription": "根据客户地理位置推荐最近门店",
-					"NSLocationAlwaysAndWhenInUseUsageDescription": "根据客户地理位置推荐最近门店"
+            "ios" : {
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报",
+                    "NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报",
+                    "NSCameraUsageDescription" : "上传用户头像保存分享海报",
+                    "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
+                    "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店"
                },
-				"idfa": false,
-				"dSYMs": false
+                "idfa" : false,
+                "dSYMs" : false
            },
            /* SDK配置 */
-			"sdkConfigs": {
-				"maps": {
-					"amap": {
-						"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
-						"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945",
-						"name": "amapIvoVHpJR"
+            "sdkConfigs" : {
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
+                        "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945",
+                        "name" : "amapIvoVHpJR"
                    }
                },
-				"payment": {
-					"weixin": {
-						"__platform__": ["ios", "android"],
-						"appid": "wx9d68c92b550ddd1e",
-						"UniversalLinks": "https://mer.crmeb.net/"
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wx9d68c92b550ddd1e",
+                        "UniversalLinks" : "https://mer.crmeb.net/"
                    }
                },
-				"share": {
-					"weixin": {
-						"appid": "wx9d68c92b550ddd1e",
-						"UniversalLinks": "https://mer.crmeb.net/"
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx9d68c92b550ddd1e",
+                        "UniversalLinks" : "https://mer.crmeb.net/"
                    }
                },
-				"geolocation": {
-					"amap": {
-						"name": "amapIvoVHpJR",
-						"__platform__": ["ios", "android"],
-						"appkey_ios": "0a3202688624938fd5d2f37b52c30d5d",
-						"appkey_android": "0354f5ddc11e2ea76c5aac647f44d945"
+                "geolocation" : {
+                    "amap" : {
+                        "name" : "amapIvoVHpJR",
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "0a3202688624938fd5d2f37b52c30d5d",
+                        "appkey_android" : "0354f5ddc11e2ea76c5aac647f44d945"
                    },
-					"system": {
-						"__platform__": ["ios", "android"]
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
                    }
                },
-				"oauth": {},
-				"ad": {}
+                "oauth" : {},
+                "ad" : {}
            },
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                },
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                    },
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                    }
                }
            },
-			"splashscreen": {
-				"useOriginalMsgbox": true
+            "splashscreen" : {
+                "useOriginalMsgbox" : true
            }
        }
    },
    /* 快应用特有相关 */
-	"quickapp": {},
+    "quickapp" : {},
    /* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wxfb4695444ab8d0d0",
-		"setting": {
-			"urlCheck": false,
-			"minified": true,
-			"postcss": true,
-			"es6": true
+    "mp-weixin" : {
+        "appid" : "wxfb4695444ab8d0d0",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "postcss" : true,
+            "es6" : true
        },
-		"permission": {
-			"scope.userLocation": {
-				"desc": "获取您的位置"
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取您的位置"
            }
        },
-		"requiredPrivateInfos": ["getLocation", "chooseAddress"],
-		"usingComponents": true
+        "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ],
+        "usingComponents" : true
    },
-	"mp-alipay": {
-		"usingComponents": true
+    "mp-alipay" : {
+        "usingComponents" : true
    },
-	"mp-baidu": {
-		"usingComponents": true
+    "mp-baidu" : {
+        "usingComponents" : true
    },
-	"mp-toutiao": {
-		"usingComponents": true
+    "mp-toutiao" : {
+        "usingComponents" : true
    },
-	"h5": {
-		"devServer": {
-			"https": false
+    "h5" : {
+        "devServer" : {
+            "https" : false
        },
-		"router": {
-			"mode": "history",
-			"base": ""
+        "router" : {
+            "mode" : "history",
+            "base" : ""
        },
-		"domain": "",
-		"sdkConfigs": {
-			"maps": {
-				"qqmap": {
-					"key": "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
+        "domain" : "",
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7"
                }
            }
        },
-		"title": "加载中...",
-		"template": "template.h5.html"
+        "title" : "加载中...",
+        "template" : "template.h5.html"
    }
 }
 //拨打电话权限关闭
 /* ios打包配置 */
+
--- a/pages/chat/customer_list/chat.vue
+++ b/pages/chat/customer_list/chat.vue
@ -36,7 +36,7 @@
 										<navigator
 											v-if="item.msn_type === 6 && item.refundOrder && item.refundOrder.refund_order_id"
 											open-type="navigate"
-											:url="'/pages/order_details/index?order_id='+item.refundOrder.order_id">
+											:url="'/pages/admin/refundDetail/index?id='+item.refundOrder.refund_order_id + '&mer_id=' + item.mer_id">
 											<div class="broadcast-details_num">
 												<span>退款单号：{{ item.refundOrder.refund_order_sn }}</span>
 											</div>
--- a/pages/chat/customer_list/index.vue
+++ b/pages/chat/customer_list/index.vue
@ -16,7 +16,7 @@
 							v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
 					</view>
 					<view class="right-box">
-						<view class="time">{{item.last && item.last.create_time.split(' ')[1] || ''}}</view>
+						<view class="time">{{item.display_time}}</view>
 						<view class="num" v-if="item.num>0">{{item.num}}</view>
 					</view>
 				</div>
@ -38,7 +38,7 @@
 							v-if="item.last &&  (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
 					</view>
 					<view class="right-box">
-						<view class="time">{{item.last && item.last.create_time.split(' ')[1]}}</view>
+						<view class="time">{{item.display_time}}</view>
 						<view class="num" v-if="item.num>0">{{item.num}}</view>
 					</view>
 				</div>
--- a/pages/index/unregist.vue
+++ b/pages/index/unregist.vue
@ -1,16 +1,20 @@
 <!-- 未开通商户 -->
 <template>
 	<view class="unregist">
-
-		<view class="icon" @click="handleBack">
-			<u-icon name="arrow-left" color="#fff" size="20"></u-icon>
-		</view>
-
+		<view class="unregist-wrap">
+			<!-- 适配不同机 -->
+			<view style="height: var(--status-bar-height);"></view>
+			<view style="display: flex;justify-content: space-between;height:100%;">
 				<view class="head">
 					<image src="@/static/images/f.png"></image>
 					<text>暂无信息</text>
 				</view>

+				<!-- 按钮 -->
+				<retuntop style="margin-right: 50rpx;margin-top: 20rpx;" />
+			</view>
+		</view>
+
 		<view class="con">
 			<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e70e7202404021040448288.png"></image>
 			<text class="empty">暂无数据</text>
@ -24,7 +28,11 @@
 </template>

 <script>
+	import retuntop from '@/components/content-top/index.vue';
 	export default {
+		components: {
+			retuntop
+		},
 		methods: {
 			handleBack() {
 				console.log(1241)
@ -52,16 +60,7 @@
 	.unregist {
 		position: relative;

-		.icon {
-			position: absolute;
-			top: calc(30rpx + var(--status-bar-height));
-			left: 30rpx;
-			z-index: 10;
-		}
-
-		.head {
-			display: flex;
-			align-items: center;
+		.unregist-wrap {
 			width: 100%;
 			height: 360rpx;
 			background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a2e04202404021019436262.webp);
@ -69,6 +68,11 @@
 			background-repeat: no-repeat;
 			background-position: center;
 			margin-bottom: 200rpx;
+		}
+
+		.head {
+			display: flex;
+			align-items: center;

 			image {
 				width: 112rpx;
--- a/pages/wholesale/wholesale/wholesale.vue
+++ b/pages/wholesale/wholesale/wholesale.vue
@ -7,7 +7,7 @@
 					<view class="tab-item" :class="{on:tabIndex==2}" @click="tabIndex = 2">商户</view>
 				</view>
 				<block v-if="tabIndex==1">
-					<view class='nav acea-row row-middle' >
+					<view class='nav acea-row row-middle'>
 						<view class='item' @click="downStatus = !downStatus"
 							:class="{'t-color':downKey>0 && firstKey == 0}">
 							{{downMenu[downKey].title}}
@ -151,8 +151,7 @@
 		<passwordPopup></passwordPopup>
 		<!-- #endif -->
 		<!-- 购物车 -->
-    <view class="card" :style="`bottom:10px`"
-      @click="navgo('/pages/order_addcart/order_addcart?product_type=98')">
+		<view class="card" :style="`bottom:10px`" @click="navgo('/pages/order_addcart/order_addcart?product_type=98')">
 			<view class="left">
 				<view class="cart" :class="{ act_cart: false }" style="position: relative; z-index: 9999999">
 					<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
@ -745,7 +744,7 @@
 						uni.showToast({
 							title: '推荐商品,加载完毕',
 							duration: 2000, // 显示时长，单位为毫秒
-							icon:'none'
+							icon: 'none'
 						})
 					}
 				});
@ -864,7 +863,7 @@
 					this.goodsNum = res.data[0].count
 				})
 			},
-      navgo(url){
+			navgo(url) {
 				uni.navigateTo({
 					url: url
 				})
@ -977,7 +976,7 @@
 		width: 62rpx;
 		font-size: 40rpx;
 		height: 86rpx;
-		line-height: 86rpx ;
+		line-height: 86rpx;
 	}

 	.productList .nav-wrapper {
@ -1484,6 +1483,7 @@
 				justify-content: center;
 				color: #fff;
 				margin: 0 20rpx;
+				// align-self: ;

 				.zhezhao {
 					position: absolute;
@ -1516,7 +1516,8 @@
 						display: flex;
 						align-items: center;
 						justify-content: space-between;
-						.left{
+
+						.left {
 							flex: 1;
 							display: flex;
 							// height: 50px;
@ -1537,9 +1538,10 @@
 								margin-right: 5px;
 							}
 						}
-            .right{
+
+						.right {
 							flex-shrink: 0;
-              background: linear-gradient(to right, #ff7b36,#F84221);
+							background: linear-gradient(to right, #ff7b36, #F84221);
 							color: #fff;
 							height: 50rpx;
 							line-height: 50rpx;
@ -1572,6 +1574,7 @@
 						.text {
 							flex: 1;
 							width: 100%;
+
 							.text_one {
 								display: flex;
 								height: 30px;
@ -1699,6 +1702,7 @@
 	.pop {
 		z-index: 1;
 	}
+
 	.score {
 		display: flex;
 		align-items: center;
@ -1713,7 +1717,8 @@
 			margin-right: 15rpx;

 		}
-    .score_text{
+
+		.score_text {
 			color: #fd5d2e;
 		}

@ -1739,6 +1744,7 @@
 			}
 		}
 	}
+
 	.card {
 		width: 720rpx;
 		z-index: 99;
@ -1767,6 +1773,7 @@
 				flex-direction: column;
 				justify-content: space-between;
 			}
+
 			.badge {
 				position: absolute;
 				top: 0;
@ -1790,6 +1797,7 @@
 			text-align: center;
 		}
 	}
+
 	.act_cart {
 		transition: 0.5s;
 		transform: scale(1.1);
--- a/pages/withdrawal/index.vue
+++ b/pages/withdrawal/index.vue
@ -54,7 +54,7 @@
 						<view class="withdrawal-form-item-label">提现金额</view>
 						<view class="withdrawal-form-item-val">
 							<input @input="onInput" type="number" placeholder="请输入提现金额"
-								placeholder-class="placeholderClass" :value="payForm.extract_money">
+								placeholder-class="placeholderClass" v-model="payForm.extract_money">
 						</view>
 					</view>
 				</view>