From 1ae987d882c1d67c0ee11c40af05d311df9e214b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 23 七月 2025 15:25:55 +0800
Subject: [PATCH] 需求改动
---
pages/tabbar/user/utils/tool.vue | 2
pages/passport/wechatMPLogin.vue | 7 -
vue.config.js | 16 ++++-
pages/supplier/suppler-order/suppler-order.vue | 20 +++---
pages/userPermissions/addStoreMember.vue | 2
pages.json | 8 ++
pages/userPermissions/userPermissions.vue | 16 ++--
pages/mine/set/personMsg.vue | 109 +++++++++++++++++++++++++-----------
8 files changed, 116 insertions(+), 64 deletions(-)
diff --git a/pages.json b/pages.json
index c51e6cb..1211af5 100644
--- a/pages.json
+++ b/pages.json
@@ -1785,8 +1785,12 @@
{
"path": "suppler-order",
"style": {
- "navigationBarTitleText": "渚涘簲鍟嗙"
+ "navigationBarTitleText": "渚涘簲鍟嗙",
// "navigationStyle": "custom"
+ "componentPlaceholder":{
+ "u-empty":"view",
+ "u-image":"view"
+ }
}
},
{
@@ -1933,7 +1937,7 @@
{
"path": "userPermissions",
"style": {
- "navigationBarTitleText": "鐢ㄦ埛鏉冮檺",
+ "navigationBarTitleText": "搴楀憳绠＄悊",
"componentPlaceholder": {
"u-icon": "view",
"u-button": "view",
diff --git a/pages/mine/set/personMsg.vue b/pages/mine/set/personMsg.vue
index 613338b..7f42ea7 100644
--- a/pages/mine/set/personMsg.vue
+++ b/pages/mine/set/personMsg.vue
@@ -1,14 +1,16 @@
<template>
<view class="person-msg">
- <view class="head c-content" @click="changeFace">
+ <view class="head c-content">
<image v-if="form.face" :src="endpoint + '/' + form.face" mode=""></image>
<image v-else :src="'/pages/subComponents/static/missing-face.png'" mode=""></image>
- <view>鐐瑰嚮淇敼澶村儚</view>
+ <button class="avatar-button" type="default" open-type="chooseAvatar"聽@chooseavatar="onChooseAvatar">鐐瑰嚮淇敼澶村儚</button>
</view>
<u-form :model="form" ref="uForm" class="form">
<u-form-item label="鏄电О" label-width="150">
- <u-input v-model="form.nickName" placeholder="璇疯緭鍏ユ樀绉�" />
+ <u-input v-model="form.nickName" placeholder="璇疯緭鍏ユ樀绉�" type="nickname"/>
+
</u-form-item>
+
<u-form-item label="鎬у埆" label-width="150">
<u-radio-group v-model="form.sex" :active-color="lightColor">
<u-radio name="1">鐢�</u-radio>
@@ -127,6 +129,7 @@
this.getMemberTag()
},
methods: {
+
toggleTag(tag) {
console.log(tag)
},
@@ -278,39 +281,67 @@
}
});
},
-
+ /**
+ * 淇敼澶村儚
+ * @param {Object} e
+ */
+ onChooseAvatar(e){
+ console.log(e.detail.avatarUrl)
+ console.log("")
+ console.log(e.detail)
+ const tempFilePath = e.detail.avatarUrl;
+ let fileName = tempFilePath.substring(tempFilePath.lastIndexOf('/') + 1);
+ if (fileName.indexOf('%') > -1) {
+ fileName = decodeURIComponent(fileName);
+ }
+ const fileKey = getFileKey(fileName);
+ this.cosClient.uploadFile({
+ Bucket: this.bucket,
+ Region: this.region,
+ Key: fileKey,
+ FilePath: tempFilePath,
+ SliceSize: 1024 * 1024 * 5 /* 瑙﹀彂鍒嗗潡涓婁紶鐨勯槇鍊�,5M */
+ }, (err, data) => {
+ if (err) {
+ console.log('涓婁紶澶辫触', err);
+ } else {
+ this.form.face = fileKey;
+ }
+ });
+ },
/**
* 淇敼澶村儚
*/
- changeFace(index) {
- uni.chooseImage({
- count: 1,
- sizeType: ['compressed'],
- sourceType: ['album'],
- success: (chooseImageRes) => {
- const tempFilePath = chooseImageRes.tempFilePaths[0];
- let fileName = tempFilePath.substring(tempFilePath.lastIndexOf('/') + 1);
- // 澶勭悊瀹夊崜鍙兘鐨刄RI缂栫爜
- if (fileName.indexOf('%') > -1) {
- fileName = decodeURIComponent(fileName);
- }
- const fileKey = getFileKey(fileName);
- this.cosClient.uploadFile({
- Bucket: this.bucket,
- Region: this.region,
- Key: fileKey,
- FilePath: tempFilePath,
- SliceSize: 1024 * 1024 * 5 /* 瑙﹀彂鍒嗗潡涓婁紶鐨勯槇鍊�,5M */
- }, (err, data) => {
- if (err) {
- console.log('涓婁紶澶辫触', err);
- } else {
- this.form.face = fileKey;
- }
- });
- },
- });
- },
+ // changeFace(index) {
+ // uni.chooseImage({
+ // count: 1,
+ // sizeType: ['compressed'],
+ // sourceType: ['album'],
+ // success: (chooseImageRes) => {
+
+ // const tempFilePath = chooseImageRes.tempFilePaths[0];
+ // let fileName = tempFilePath.substring(tempFilePath.lastIndexOf('/') + 1);
+ // // 澶勭悊瀹夊崜鍙兘鐨刄RI缂栫爜
+ // if (fileName.indexOf('%') > -1) {
+ // fileName = decodeURIComponent(fileName);
+ // }
+ // const fileKey = getFileKey(fileName);
+ // this.cosClient.uploadFile({
+ // Bucket: this.bucket,
+ // Region: this.region,
+ // Key: fileKey,
+ // FilePath: tempFilePath,
+ // SliceSize: 1024 * 1024 * 5 /* 瑙﹀彂鍒嗗潡涓婁紶鐨勯槇鍊�,5M */
+ // }, (err, data) => {
+ // if (err) {
+ // console.log('涓婁紶澶辫触', err);
+ // } else {
+ // this.form.face = fileKey;
+ // }
+ // });
+ // },
+ // });
+ // },
/**
* 閫夋嫨鍦板潃
@@ -497,4 +528,16 @@
color: #999;
font-size: 24rpx;
}
+ .avatar-button {
+ background: transparent;
+ color: $font-color-light;
+ font-size: $font-sm;
+ line-height: 2em;
+ margin: 0;
+ padding: 0;
+ border: none;
+ &::after {
+ border: none;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue
index c8d0de2..8f36bf6 100644
--- a/pages/passport/wechatMPLogin.vue
+++ b/pages/passport/wechatMPLogin.vue
@@ -16,8 +16,7 @@
<view class="logo-info">
<text class="title">娆㈣繋杩涘叆{{ projectName }}</text>
</view>
- <!-- <input ref="nicknameInput" type="nickname"/>
- <button聽type="default" open-type="chooseAvatar"聽@chooseavatar="onChooseAvatar">閫夋嫨</button> -->
+
<view class="small-tips">
<view>涓烘偍鎻愪緵浼樿川鏈嶅姟,{{ projectName }}闇�瑕佽幏鍙栦互涓嬩俊鎭�</view>
<view>鎮ㄧ殑鍏紑淇℃伅锛堟樀绉般�佸ご鍍忥級</view>
@@ -114,9 +113,7 @@
url: `/pages/tabbar/home/index`,
});
},
- onChooseAvatar(e){
- console.log(e.detail.avatarUrl)
- },
+
//鑾峰彇鐢ㄦ埛淇℃伅
getUserProfile(e) {
if(!this.checked){
diff --git a/pages/supplier/suppler-order/suppler-order.vue b/pages/supplier/suppler-order/suppler-order.vue
index 76b984c..f2e3324 100644
--- a/pages/supplier/suppler-order/suppler-order.vue
+++ b/pages/supplier/suppler-order/suppler-order.vue
@@ -179,13 +179,13 @@
orderList: [],
pageNumber: 1,
},
- // {
- // state: 4,
- // text: "宸插畬鎴�",
- // loadStatus: "more",
- // orderList: [],
- // pageNumber: 1,
- // },
+ {
+ state: 4,
+ text: "宸插畬鎴�",
+ loadStatus: "more",
+ orderList: [],
+ pageNumber: 1,
+ },
// {
// state: 5,
// text: "宸插彇娑�",
@@ -214,9 +214,9 @@
{
orderStatus: "WAIT_ROG", //寰呮敹璐�
},
- // {
- // orderStatus: "COMPLETE", //宸插畬鎴�
- // },
+ {
+ orderStatus: "COMPLETE", //宸插畬鎴�
+ },
// {
// orderStatus: "CANCELLED", //宸插彇娑�
// },
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index c451b62..3703d08 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -65,7 +65,7 @@
<view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/userPermissions/userPermissions')">
<image src="/static/mine/shensu.png" mode=""></image>
- <view>鏂板搴楀憳</view>
+ <view>搴楀憳绠＄悊</view>
</view>
<view class="interact-item" @click="navigateTo('/pages/news/news')">
<image src="/static/mine/shensu.png" mode=""></image>
diff --git a/pages/userPermissions/addStoreMember.vue b/pages/userPermissions/addStoreMember.vue
index 4de971f..c20f723 100644
--- a/pages/userPermissions/addStoreMember.vue
+++ b/pages/userPermissions/addStoreMember.vue
@@ -19,7 +19,7 @@
<u-input v-model="form.password" placeholder="璇疯緭鍏ュ瘑鐮�" border="none" type="password" />
</u-form-item>
- <u-form-item label="瓒呯骇绠＄悊鍛�" prop="isSuper" borderBottom required="true">
+ <u-form-item label="搴楅摵绠＄悊鍛�" prop="isSuper" borderBottom required="true">
<view class="switch-wrapper">
<u-switch v-model="form.isSuper"></u-switch>
</view>
diff --git a/pages/userPermissions/userPermissions.vue b/pages/userPermissions/userPermissions.vue
index 5f4d1b6..74d9a78 100644
--- a/pages/userPermissions/userPermissions.vue
+++ b/pages/userPermissions/userPermissions.vue
@@ -2,17 +2,17 @@
<view class="container">
<!-- 鏍囬 -->
<view class="header">
- <text class="title">鐢ㄦ埛鍒楄〃</text>
+ <text class="title">搴楀憳鍒楄〃</text>
</view>
<view>
- <button class="add-btn" @click="navigateToAdd()">鏂板鐢ㄦ埛</button>
+ <button class="add-btn" @click="navigateToAdd()">鏂板搴楀憳</button>
</view>
<!-- 鎼滅储妗� -->
<view class="search-box">
<u-search v-model="query.realName" placeholder="鎼滅储濮撳悕" :showAction="false" @change="searchClerk()"></u-search>
</view>
- <!-- 鐢ㄦ埛鍒楄〃 -->
+ <!-- 搴楀憳鍒楄〃 -->
<scroll-view scroll-y class="clerk-list" @scrolltolower="loadMore" v-if="clerkList.length > 0">
<view class="clerk-item" v-for="(clerk, index) in clerkList" :key="clerk.id" >
@@ -72,7 +72,7 @@
data() {
return {
total:0,
- clerkList: [], // 鐢ㄦ埛鍒楄〃鏁版嵁
+ clerkList: [], // 搴楀憳鍒楄〃鏁版嵁
loading: false, // 鍔犺浇鐘舵��
noMore: false, // 鏄惁娌℃湁鏇村鏁版嵁
query: {
@@ -90,7 +90,7 @@
},
onLoad() {
this.getPage()
- //鑾峰緱鐢ㄦ埛鏉冮檺
+ //鑾峰緱搴楀憳鏉冮檺
checkClerkPermission().then(res=>{
this.isSuper = res.data.data.isSuper;
this.isShopkeeper = res.data.data.isShopkeeper;
@@ -152,7 +152,7 @@
},
- // 鎼滅储鐢ㄦ埛
+ // 鎼滅储搴楀憳
searchClerk() {
this.query.pageNumber = 1
this.noMore = false
@@ -167,13 +167,13 @@
this.getPage()
}
},
- // 璺宠浆鍒版柊澧炵敤鎴�
+ // 璺宠浆鍒版柊澧炲簵鍛�
navigateToAdd() {
uni.navigateTo({
url: `/pages/userPermissions/addStoreMember`
})
},
- // 璺宠浆鍒扮敤鎴疯鎯�
+ // 璺宠浆鍒板簵鍛樿鎯�
navigateToDetail(id) {
uni.navigateTo({
url: `/pages/userPermissions/addStoreMember?id=${id}`
diff --git a/vue.config.js b/vue.config.js
index 5716f5e..216ad92 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,7 +1,7 @@
-// module.exports = {
+module.exports = {
// /**
-// * 姝ゅ涓哄彂琛宧5,寰俊灏忕▼搴忥紝app涓垹闄onsole
+// * 姝ゅ涓哄彂琛宧5,寰俊灏忕▼搴忥紝app涓垹闄onsole
// * 濡傞渶鏄剧ずconsole 闇�瑕佹敞閲婃澶勯噸鏂拌繍琛�
// */
// chainWebpack: (config) => {
@@ -17,5 +17,13 @@
// return args
// })
-// }
-// }
\ No newline at end of file
+// },
+ css: {
+ loaderOptions: {
+ sass: {
+ implementation: require('node-sass'), // 鏄庣‘浣跨敤 node-sass
+ },
+ },
+ },
+}
+
--
Gitblit v1.8.0