瀏覽代碼

fix: 优化

chenjj 3 周之前
父節點
當前提交
30996ed8cc
共有 6 個文件被更改,包括 20 次插入12 次删除
  1. 2 2
      config.js
  2. 5 4
      manifest.json
  3. 7 3
      pages/common/orderList/listItem.vue
  4. 3 0
      pages/mallMenu.vue
  5. 2 2
      pages_classify/pages/order/index.vue
  6. 1 1
      pages_home/pages/register/index.vue

+ 2 - 2
config.js

@@ -2,8 +2,8 @@
 const config = {
 const config = {
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
 	//cloud后台网关地址
 	//cloud后台网关地址
-	// baseUrl: 'http://192.168.100.133:9527',
-	baseUrl: 'https://zybooks.tech/prod-api',
+	baseUrl: 'http://192.168.100.133:9527',
+	// baseUrl: 'https://zybooks.tech/prod-api',
 	mapKey:'KFEBZ-P2GKZ-A5PX4-7Q6Y7-KXOBF-XCB4C',
 	mapKey:'KFEBZ-P2GKZ-A5PX4-7Q6Y7-KXOBF-XCB4C',
 	appName: '金邻助家',
 	appName: '金邻助家',
 	// 应用信息
 	// 应用信息

+ 5 - 4
manifest.json

@@ -64,12 +64,13 @@
         "requiredPrivateInfos": [
         "requiredPrivateInfos": [
             "getLocation",
             "getLocation",
             "chooseLocation"
             "chooseLocation"
-          ],
-         "permission": {
+        ],
+        "permission": {
             "scope.userLocation": {
             "scope.userLocation": {
-              "desc": "你的位置信息将用于警情上报"
+                "desc": "你的位置信息将用于警情上报"
             }
             }
-          }
+        },
+        "mergeVirtualHostAttributes": true
     },
     },
     "mp-alipay": {
     "mp-alipay": {
         "usingComponents": true
         "usingComponents": true

+ 7 - 3
pages/common/orderList/listItem.vue

@@ -1,7 +1,8 @@
 <template>
 <template>
     <view class="item">
     <view class="item">
         <view class="item-img">
         <view class="item-img">
-            <img :src="baseUrl + data.avatar" alt="" style="width: 112rpx; height: 112rpx;">
+            <!-- <img :src="data.avatar" alt="" style="width: 112rpx; height: 112rpx;"> -->
+            <up-image :show-loading="true" :src="data.avatar" width="112rpx" height="112rpx"></up-image>
         </view>
         </view>
         <view class="item-info">
         <view class="item-info">
             <view class="item-title-box">
             <view class="item-title-box">
@@ -21,7 +22,7 @@
                     {{ data.address }}
                     {{ data.address }}
                 </view>
                 </view>
                 <view class="item-time">
                 <view class="item-time">
-                    {{ data.createTime }}
+                    服务时间:{{ data.workStartTime }}(<text class="item-time-text">{{ data.serviceDuration }}分钟</text>)
                 </view>
                 </view>
                 <view class="item-price"><span class="item-price-yuan">¥</span> {{ data.serviceOnePrice || 0 }}</view>
                 <view class="item-price"><span class="item-price-yuan">¥</span> {{ data.serviceOnePrice || 0 }}</view>
             </view>
             </view>
@@ -125,7 +126,7 @@ function onClick(type) {
             letter-spacing: 0rpx;
             letter-spacing: 0rpx;
             line-height: 39rpx;
             line-height: 39rpx;
             color: rgba(153, 153, 153, 1);
             color: rgba(153, 153, 153, 1);
-            margin-bottom: 40rpx;
+            margin-bottom: 20rpx;
         }
         }
 
 
         .item-price {
         .item-price {
@@ -180,4 +181,7 @@ function onClick(type) {
         }
         }
     }
     }
 }
 }
+.item-time-text {
+    color: #dd5e45;
+}
 </style>
 </style>

+ 3 - 0
pages/mallMenu.vue

@@ -51,6 +51,9 @@ export default {
         }
         }
     },
     },
     onReady() {
     onReady() {
+ 
+    },
+    onShow() {
         this.getData();
         this.getData();
         this.getMenuItemTop()
         this.getMenuItemTop()
     },
     },

+ 2 - 2
pages_classify/pages/order/index.vue

@@ -36,7 +36,7 @@
 				</view>
 				</view>
 				<view class="upload-box-see">
 				<view class="upload-box-see">
 					<view class="upload-img-item" v-for="(item) in volunteerPicture" :key="item.url">
 					<view class="upload-img-item" v-for="(item) in volunteerPicture" :key="item.url">
-						<img class="upload-img-see" :src="item.url" :alt="item.fileName" srcset="">
+						<up-image class="upload-img-see" :show-loading="true" :src="item.url" :alt="item.fileName"></up-image>
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
@@ -50,7 +50,7 @@
 				</view>
 				</view>
 				<view class="upload-box-see">
 				<view class="upload-box-see">
 					<view class="upload-img-item" v-for="(item) in userPicture" :key="item.url">
 					<view class="upload-img-item" v-for="(item) in userPicture" :key="item.url">
-						<img class="upload-img-see" :src="item.url" :alt="item.fileName" srcset="">
+						<up-image class="upload-img-see" :show-loading="true" :src="item.url" :alt="item.fileName"></up-image>
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>

+ 1 - 1
pages_home/pages/register/index.vue

@@ -173,7 +173,7 @@ function onSubmit() {
 				const element = updata_list[i];
 				const element = updata_list[i];
 
 
 
 
-				const type = element.required && element.permission.includes(data.value.key) && !file_url[element.key];
+				const type = element.required&& !file_url[element.key];
 
 
 				if (type) {
 				if (type) {
 					uni.showToast({
 					uni.showToast({