fix:优化

components/inquiry-verification-list/index.vue

@@ -34,6 +34,7 @@
                     </view>
                 </view>
             </view>
+            <u-empty v-if="list.length === 0"></u-empty>
         </scroll-view>
 
         <add-inquiry-dialog ref="addInquiryDialog" editOrAdd="edit" :editInfo="editInfo" :isShowHistory="true" :type="type" :title="type == '1' ? '询价' : '核价'" @submitSuccess="onRefresh" />

components/remote-search-select/index.vue

@@ -198,7 +198,7 @@ export default {
                 sizeType: ['compressed'],
                 sourceType: ['album', 'camera'],
                 success: (res) => {
-                    this.$emit('upload',res)
+                    this.$emit('upload',res.tempFilePaths[0])
                 }
             })
         },
@@ -250,6 +250,10 @@ export default {
             this.croppedImages = []
         },
         handleSelectImg(item) {
+            if(!item.record.model){
+                uni.$u.toast("型号为空,请重新选择")
+                return
+            }
             this.$emit('select-img', item)
             this.closeImgPopup()
         },

pages/clue/components/trend.vue

@@ -1,7 +1,7 @@
 <template>
     <u-modal :show="trendModal" title="价格趋势" @confirm="closeTrendModal" confirmText="关闭弹窗" height="93%"><view class="trend_modal">
             <RemoteSearchSelect ref="searchSelect" :value="model" placeholder="请输入关键词" :resultsShow="resultsShow" :currentUrl="currentImg" :searchResults="searchResults" :imgResults="imgResults" :loading="loading"
-                :cameraEnabled="true" @search="handleSearch" @select="handleSelect" @select-img="handleSelectImg" @select-crop-img="handleSelectCropImg" @load-more="loadMore" @load-more-img="loadMoreImg" @clear="handleClear" @focus="handleFocus" @upload="uploadImage"></RemoteSearchSelect>
+                :cameraEnabled="true" @search="handleSearch" @select="handleSelect" @select-img="handleSelectImg" @select-crop-img="handleSelectCropImg" @load-more="loadMore" @load-more-img="loadMoreImg" @clear="handleClear" @focus="handleFocus" @upload="handleSelectCropImg"></RemoteSearchSelect>
             <view class="charts_box" v-if="chartShow">
                 <u--text type="primary" :text="`最大价格：${Math.max(...maxPrice)}元`"></u--text>
                 <u--text type="warning" :text="`最小价格：${Math.min(...minPrice)}元`"></u--text>
@@ -208,7 +208,7 @@ export default {
         handleSelectCropImg(file) {
             this.imgPageNum = 1
             this.imgTotal = 0
-            
+            this.imgResults = []
             const data = {
                 tempFilePaths:[file]
             }
@@ -335,9 +335,7 @@ export default {
                         uni.$u.toast('未匹配到型号，请换一张图或手动输入');
                     }
                 }).catch((err) => {
-    
                     console.log(err);
-                    
                     uni.$u.toast('识别失败，请重试');
                 });
             })

pages/wareHouse/components/fieldPermissions.vue

@@ -103,6 +103,7 @@
 </template>
 
 <script>
+import {updateFieldPermissions,updateButtonPermissions} from "@/utils/util.js";
 const FIELD_LABELS = {
 	goodPicFileList: '商品图片', desc: '商品描述', origin: '来源', type: '商品分类', dictLabel: '品牌',
 	series: '系列', model: '型号', dialType: '机芯类型', caseMaterial: '表壳材质', dialDiameter: '表盘直径',
@@ -219,6 +220,8 @@ export default {
 					this.loadConfigLoading = false;
 				});
 		},
+		updateFieldPermissions:updateFieldPermissions,
+		updateButtonPermissions:updateButtonPermissions,
 		saveConfig() {
 			const roleId = this.currentRoleId;
 			const roleKey = this.currentRoleKey;
@@ -245,6 +248,7 @@ export default {
 				.finally(() => {
 					this.saveLoading = false;
 				});
+			this.updateFieldPermissions();
 		},
 		saveButtonConfig() {
 			const roleId = this.currentRoleId;
@@ -268,6 +272,7 @@ export default {
 				.finally(() => {
 					this.saveLoading = false;
 				});
+			this.updateButtonPermissions();
 		},
 		clearConfig() {
 			if (!this.currentRoleId) return;

store/modules/user.js

@@ -1,6 +1,8 @@
 import permision from "@/js_sdk/wa-permission/permission.js";
 import {
-	getMacAddress
+	getMacAddress,
+	updateFieldPermissions,
+	updateButtonPermissions,
 } from "../../utils/util";
 import {
 	systemList
@@ -29,8 +31,8 @@ export default {
 		netConfig: {
 			// http://59.42.9.166:9520/proxy
 			// http://10.0.7.100:9500
-			// ip: "https://crm.nanjingshiyu.com/prod-api/", // ip
-			ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
+			ip: "https://crm.nanjingshiyu.com/prod-api/", // ip
+			// ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
 			// ip : "/api", // 测试环境ip
 			// ip : "http://47.113.184.101", // 测试环境ip
 			// ip: "http://172.16.7.200", // ip
@@ -230,20 +232,8 @@ export default {
 					} else {
 						commit("SET_PERMISSIONS", []);
 					}
-					// 登录后拉取仓库字段权限并存到 store（按当前用户角色合并）
-					uni.$u.api.wareHouseFieldPermissions({}).then((permRes) => {
-						const list = (permRes && permRes.data && Array.isArray(permRes.data)) ? permRes.data : [];
-						commit("SET_WAREHOUSE_FIELD_PERMISSIONS", list);
-					}).catch(() => {
-						commit("SET_WAREHOUSE_FIELD_PERMISSIONS", []);
-					});
-					// 登录后拉取仓库按钮权限并存到 store（按当前用户角色合并）
-					uni.$u.api.wareHouseButtonPermissions({}).then((permRes) => {
-						const list = (permRes && permRes.data && Array.isArray(permRes.data)) ? permRes.data : [];
-						commit("SET_WAREHOUSE_BUTTON_PERMISSIONS", list);
-					}).catch(() => {
-						commit("SET_WAREHOUSE_BUTTON_PERMISSIONS", []);
-					});
+					updateFieldPermissions();
+					updateButtonPermissions();
 					commit("SET_BELONGSYSTEM", {
 						code: state.system.value,
 						callback: (flag) => {

utils/util.js

@@ -416,10 +416,28 @@ export function getWarehouseFieldPermissions(field,permission) {
 }
 export function getWarehouseButtonPermissions(buttonKey) {
     const permissionItem = store.state.user.warehouseButtonPermissions?.find(item=>item.buttonKey === buttonKey);
-	console.log(permissionItem)
-	if(!permissionItem.enabled){
+	if(!permissionItem || !permissionItem.enabled){
 		uni.$u.toast('无权限');
+		return false;
 	}else{
 		return true
 	}
 }
+// 拉取仓库字段权限并存到 store
+export function updateFieldPermissions(){
+	uni.$u.api.wareHouseFieldPermissions({}).then((permRes) => {
+		const list = (permRes && permRes.data && Array.isArray(permRes.data)) ? permRes.data : [];
+		store.commit("user/SET_WAREHOUSE_FIELD_PERMISSIONS", list);
+	}).catch(() => {
+		store.commit("user/SET_WAREHOUSE_FIELD_PERMISSIONS", []);
+	});
+}
+// 拉取仓库按钮权限并存到 store
+export function updateButtonPermissions(){
+	uni.$u.api.wareHouseButtonPermissions({}).then((permRes) => {
+		const list = (permRes && permRes.data && Array.isArray(permRes.data)) ? permRes.data : [];
+		store.commit("user/SET_WAREHOUSE_BUTTON_PERMISSIONS", list);
+	}).catch(() => {
+		store.commit("user/SET_WAREHOUSE_BUTTON_PERMISSIONS", []);
+	});
+}