feat: 分包、订单接口对接

api/volunteer.js

@@ -9,6 +9,15 @@ export function add(data) {
     })
 }
 
+//志愿者信息回显
+export function getVolunteerInfo(data) {
+    return request({
+        url: `/core/volunteer/info/volunteerInfo`,
+        method: 'get',
+        params: data
+    })
+}
+
 
 //修改志愿者排班日期
 export function workDate(data) {

components/cust-form/index.vue

@@ -39,7 +39,7 @@
                             message: '请填写4位验证码',
                             trigger: ['blur']
                         }
-                    ]" :required="true">
+                    ]" :required="true" v-if="isCode">
                         <up-input v-model="formData.code" border="none" placeholder="请填写验证码"></up-input>
                         <template #right>
                             <up-button @tap="getCode" :text="code_data.tips" type="success" size="mini"
@@ -93,6 +93,10 @@ const props = defineProps({
         type: Array,
         default: [],
     },
+    isCode:{
+        type: Boolean,
+        default: true
+    }
 });
 
 const formData = reactive({
@@ -197,7 +201,12 @@ function startFace() {
 
 
 function setData(data) {
-    Object.assign(formData, data)
+    console.log('setData=>data',data);
+    
+    Object.assign(formData, {...data,
+        sex: data.sex === 0 ? '男' : '女',
+
+    })
 }
 
 function onSubmit() {

components/updata-imgs/index.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import { wxUploadFile } from '@/utils/wxRequest.js'
 
 const props = defineProps({
@@ -33,6 +33,11 @@ const props = defineProps({
             img: "/static/img/updata-user-img.png"
         },
     },
+    fileList: {
+        type: String,
+        default: ''
+
+    }
 });
 const emit = defineEmits(['onSubmit']);
 
@@ -57,8 +62,23 @@ function getFile() {
     emit('onSubmit', { key: props.data.key, url: img_urls })
     return img_urls
 }
+
+function setFile(files){
+    console.log('fileList=>files',files);
+
+    const arr_file = files.split(',').map(item=> {
+        return {url:item}
+    })
+    console.log('fileList',files.split(','));
+    fileList.value = arr_file
+}
+watch(()=>props.fileList,()=>{
+    setFile(props.fileList);
+})
+
 defineExpose({
     getFile,
+    setFile
 });
 </script>
 

pages.json

@@ -38,12 +38,6 @@
 				"navigationBarTitleText": "工作台"
 			}
 		},
-		// {
-		//   "path": "pages/template",
-		//   "style": {
-		//     "navigationBarTitleText": "模板"
-		//   }
-		// },
 		{
 			"path": "pages/classify",
 			"style": {
@@ -73,82 +67,7 @@
 			"style": {
 				"navigationBarTitleText": "详情"
 			}
-		},      
-		{
-			"path" : "pages/myCenter/wallet",
-			"style" : 
-			{
-				"navigationBarTitleText" : "钱包"
-			}
-		},
-		{
-			"path" : "pages/myCenter/withdrawal",
-			"style" : 
-			{
-				"navigationBarTitleText" : "提现"
-			}
-		},
-		{
-			"path" : "pages/myCenter/income",
-			"style" : 
-			{
-				"navigationBarTitleText" : "收入明细"
-			}
-		},
-		{
-			"path" : "pages/myCenter/addBankCard",
-			"style" : 
-			{
-				"navigationBarTitleText" : "添加银行卡"
-			}
-		},
-		{
-			"path" : "pages/myCenter/bankCardDetails",
-			"style" : 
-			{
-				"navigationBarTitleText" : "银行卡详情"
-			}
-		},
-		{
-			"path" : "pages/myCenter/bad",
-			"style" : 
-			{
-				"navigationBarTitleText" : "差评申诉"
-			}
-		},
-		{
-			"path" : "pages/myCenter/appeal",
-			"style" : 
-			{
-				"navigationBarTitleText" : "申诉"
-			}
-		},
-		{
-			"path" : "pages/talk/pages/index/index",
-			"style" : 
-			{
-				"navigationBarTitleText" : "消息"
-			}
 		}
-	    
-        // ,{
-        //     "path" : "components/Volunteerside/Volunteerside",
-        //     "style" :                                                                                    
-        //     {
-        //         "navigationBarTitleText": "",
-        //         "enablePullDownRefresh": false
-        //     }
-            
-        // }
-        // ,{
-        //     "path" : "static/imageDetails/imageDetails",
-        //     "style" :                                                                                    
-        //     {
-        //         "navigationBarTitleText": "",
-        //         "enablePullDownRefresh": false
-        //     }
-            
-        // }
     ],
 	"subPackages": [
 		{
@@ -176,51 +95,58 @@
 					"style": {
 						"navigationBarTitleText": "消息"
 					}
+				},
+				{
+					"path": "talk/pages/index/index",
+					"style": {
+						"navigationBarTitleText": "消息"
+					}
 				}
 			]
 		},
 		{
 			"root": "pages_mine/pages",
-			"pages": [{
-					"path": "avatar/index",
+			"pages": [
+				{
+					"path": "wallet/index",
 					"style": {
-						"navigationBarTitleText": "修改头像"
+						"navigationBarTitleText": "钱包"
 					}
 				},
 				{
-					"path": "info/index",
+					"path": "bad/index",
 					"style": {
-						"navigationBarTitleText": "个人信息"
+						"navigationBarTitleText": "差评申述"
 					}
 				},
 				{
-					"path": "info/edit",
+					"path": "withdrawal/index",
 					"style": {
-						"navigationBarTitleText": "编辑资料"
+						"navigationBarTitleText": "提现"
 					}
 				},
 				{
-					"path": "pwd/index",
+					"path": "income/index",
 					"style": {
-						"navigationBarTitleText": "修改密码"
+						"navigationBarTitleText": "收入明细"
 					}
 				},
 				{
-					"path": "setting/index",
+					"path": "addBankCard/index",
 					"style": {
-						"navigationBarTitleText": "应用设置"
+						"navigationBarTitleText": "添加银行卡"
 					}
 				},
 				{
-					"path": "help/index",
+					"path": "bankCardDetails/index",
 					"style": {
-						"navigationBarTitleText": "常见问题"
+						"navigationBarTitleText": "银行卡详情"
 					}
 				},
 				{
-					"path": "about/index",
+					"path": "appeal/index",
 					"style": {
-						"navigationBarTitleText": "关于我们"
+						"navigationBarTitleText": "银行卡详情"
 					}
 				}
 			]
@@ -320,7 +246,6 @@
 				}
 			]
 		},
-		// 订单
 		{
 			"root": "pages_classify/pages",
 			"pages": [
@@ -389,12 +314,6 @@
 				"selectedIconPath": "static/images/tabbar/home_.png",
 				"text": "首页"
 			},
-			// {
-			// 	"pagePath": "pages/work",
-			// 	"iconPath": "static/images/tabbar/work.png",
-			// 	"selectedIconPath": "static/images/tabbar/work_.png",
-			// 	"text": "工作台"
-			// },
 			{
 				"pagePath": "pages/classify",
 				"iconPath": "static/images/tabbar/work.png",

pages/classify.vue

@@ -155,8 +155,10 @@
 			});
 			return
 		}
+		
+		//前往沟通
 		uni.navigateTo({
-			url: `/pages/order/handle?orderId=${row.secondOrderId}`
+			url: `/pages_orderuser/pages/talk/pages/index/index?orderId=${row.secondOrderId}`
 		});
 
 	}

pages/mine.vue

@@ -5,9 +5,9 @@
 			<view class="mine-user">
 				<view class="user-name-box">
 					<view class="user-avatar">
-						<up-avatar :src="avatarSrc" shape="square"></up-avatar>
+						<up-avatar :src="userInfo.avatar" shape="square"></up-avatar>
 					</view>
-					<view class="user-name">战三</view>
+					<view class="user-name">{{ userInfo.nickName }}</view>
 				</view>
 				<up-divider></up-divider>
 				<view class="service-list" v-if="userType == '2'">
@@ -88,12 +88,17 @@ import {
 import {
 	getVolunteerAccount
 } from '@/api/volunteer.js'
+import {
+		onLoad,
+		onShow
+	} from '@dcloudio/uni-app';
+import store from "@/store"
 const userType = uni.getStorageSync('userType') //读取本地存储
 
 // 用户/志愿者 识别标识
 const userOrWorker = uni.getStorageSync('storage_data').vuex_userOrWorker //读取本地存储
 
-
+const userInfo = ref({});
 
 const serviceList = ref(
 	[{
@@ -117,12 +122,12 @@ const serviceList = ref(
 	{
 		name: '差评申述',
 		iconName: 'edit-pen',
-		page: '/pages/myCenter/bad'
+		page: '/pages_mine/pages/bad/index'
 	},
 	{
 		name: '钱包',
 		iconName: 'rmb-circle',
-		page: '/pages/myCenter/wallet'
+		page: '/pages_mine/pages/wallet/index'
 	},
 	{
 		name: '帮助与客服',
@@ -160,7 +165,7 @@ const serviceList2 = ref([{
 {
 	name: '钱包',
 	iconName: 'rmb-circle',
-	page: '/pages/myCenter/withdrawal'
+	page: '/pages_mine/pages/wallet/index'
 },
 {
 	name: '帮助与客服',
@@ -169,7 +174,7 @@ const serviceList2 = ref([{
 {
 	name: '浏览记录',
 	iconName: 'eye',
-	page: '/pages/myCenter/withdrawal'
+	page: '/pages_mine/pages/wallet/index'
 },
 {
 	name: '收藏',
@@ -249,6 +254,16 @@ const getDetails = async () => {
 
 	}
 }
+
+const geUserInfo = () => {
+	console.log(store.state, '>>>>99');
+	userInfo.value = store.state.user
+}
+
+onShow(() => {
+		geUserInfo();
+
+	})
 </script>
 
 <style lang="scss" scoped>

pages_home/pages/register/data.js

@@ -88,7 +88,7 @@ const chatting = [
     {
         label: "地区",
         key: "city",
-        type: "select",
+        type: "city",
         option: city_option,
         rules: rules.city,
     },

pages_home/pages/register/index.vue

@@ -1,30 +1,29 @@
 <template>
 	<view class="register-main">
+		<up-alert description="您已完成账户注册" type="success" showIcon closable v-if="!isAdd"></up-alert>
 		<view class="register-user-info">
 			<FontTitle title="请完成注册信息填报" />
-			<CustForm :column="com_column" ref="cust_form_ref" />
-		</view>
-		<view class="updata-imgs">
-
+			<CustForm :column="com_column" ref="cust_form_ref" :isCode="isAdd"/>
 		</view>
 
 		<view v-for="item in updata_list" :key="item.key" class="updata-imgs">
-			<UpdataImgs :data="item" ref="zsImg" v-if="item.permission.includes(data.key)" @onSubmit="onChange" />
+			<UpdataImgs :fileList="file_url[item.key]" :data="item" ref="zsImg"
+				v-if="item.permission.includes(data.key)" @onSubmit="onChange" />
 		</view>
 
-		<up-button type="primary" text="确定" @click="onSubmit"></up-button>
+		<up-button type="primary" text="确定" @click="onSubmit" v-if="isAdd"></up-button>
 
 	</view>
 </template>
 
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref, reactive, onMounted, nextTick } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
 import FontTitle from "@/components/font-title/index.vue";
 import CustForm from "@/components/cust-form/index";
 import UpdataImgs from "@/components/updata-imgs/index.vue";
 import { chatting, education, clean } from "./data";
-import { add } from "@/api/volunteer";
+import { add, getVolunteerInfo } from "@/api/volunteer";
 import { computed } from 'vue';
 
 
@@ -68,6 +67,7 @@ const data = ref(null);
 
 const file_url = reactive({});
 
+const isAdd = ref(true);//是否已经注册
 
 const sex_status = {
 	'男': 0,
@@ -81,7 +81,8 @@ const register_column = {
 
 //根据类型获取表单item 值
 const com_column = computed(() => {
-	return data.value ? register_column[data.value.key] : []
+	let column_list =  data.value ? register_column[data.value.key] : [];
+	return column_list
 })
 
 function onSubmit() {
@@ -153,6 +154,30 @@ function onChange({ key, url }) {
 	})
 }
 
+function getRegister() {
+	getVolunteerInfo({ serviceCategory: data.value.key }).then(res => {
+		console.log('xxxxxxxxxxres', res, cust_form_ref.value);
+		if (res.data) {
+			cust_form_ref.value.setData(res.data);
+			Object.assign(file_url, {
+				volunteerPicture: res.data.volunteerPicture,
+				idCardPicture: res.data.idCardPicture,
+				certificationPicture: res.data.certificationPicture
+			})
+			isAdd.value = false;
+		}
+
+
+
+	})
+}
+
+// onMounted(() => {
+// 	nextTick(() => {
+
+// 	});
+
+// })
 
 onLoad((options) => {
 	const option = JSON.parse(decodeURIComponent(options.data));
@@ -162,6 +187,11 @@ onLoad((options) => {
 	uni.setNavigationBarTitle({
 		title: option.name  // 根据业务逻辑调整 
 	});
+
+	setTimeout(() => {
+		getRegister();
+	}, 500);
+
 })
 
 

pages_mine/pages/about/index.vue

@@ -1,71 +0,0 @@
-<template>
-  <view class="about-container">
-    <view class="header-section text-center">
-      <image style="width: 150rpx;height: 150rpx;" src="/static/logo200.png" mode="widthFix">
-      </image>
-      <uni-title type="h2" title="若依移动端"></uni-title>
-    </view>
-
-    <view class="content-section">
-      <view class="menu-list">
-        <view class="list-cell list-cell-arrow">
-          <view class="menu-item-box">
-            <view>版本信息</view>
-            <view class="text-right">v{{version}}</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow">
-          <view class="menu-item-box">
-            <view>官方邮箱</view>
-            <view class="text-right">ruoyi@xx.com</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow">
-          <view class="menu-item-box">
-            <view>服务热线</view>
-            <view class="text-right">400-999-9999</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow">
-          <view class="menu-item-box">
-            <view>公司网站</view>
-            <view class="text-right">
-              <uni-link :href="url" :text="url" showUnderLine="false"></uni-link>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="copyright">
-      <view>Copyright &copy; 2022 ruoyi.vip All Rights Reserved.</view>
-    </view>
-  </view>
-</template>
-
-<script setup>
-	import config from '@/config.js'
-	const url=config.appInfo.site_url;
-	const version=config.appInfo.version;
-  
-</script>
-
-<style lang="scss">
-  page {
-    background-color: #f8f8f8;
-  }
-
-  .copyright {
-    margin-top: 50rpx;
-    text-align: center;
-    line-height: 60rpx;
-    color: #999;
-  }
-
-  .header-section {
-    display: flex;
-    padding: 30rpx 0 0;
-    flex-direction: column;
-    align-items: center;
-  }
-</style>

pages_mine/pages/avatar/index.vue

@@ -1,642 +0,0 @@
-<template>
-	<view class="container">
-		<view class="page-body uni-content-info">
-			<view class='cropper-content'>
-				<view v-if="isShowImg" class="uni-corpper"
-					:style="'width:' + cropperInitW + 'px;height:' + cropperInitH + 'px;background:#000'">
-					<view class="uni-corpper-content"
-						:style="'width:' + cropperW + 'px;height:' + cropperH + 'px;left:' + cropperL + 'px;top:' + cropperT + 'px'">
-						<image :src="imageSrc" :style="'width:' + cropperW + 'px;height:' + cropperH + 'px'"></image>
-						<view class="uni-corpper-crop-box" @touchstart.stop="contentStartMove"
-							@touchmove.stop="contentMoveing" @touchend.stop="contentTouchEnd"
-							:style="'left:' + cutL + 'px;top:' + cutT + 'px;right:' + cutR + 'px;bottom:' + cutB + 'px'">
-							<view class="uni-cropper-view-box">
-								<view class="uni-cropper-dashed-h"></view>
-								<view class="uni-cropper-dashed-v"></view>
-								<view class="uni-cropper-line-t" data-drag="top" @touchstart.stop="dragStart"
-									@touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-line-r" data-drag="right" @touchstart.stop="dragStart"
-									@touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-line-b" data-drag="bottom" @touchstart.stop="dragStart"
-									@touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-line-l" data-drag="left" @touchstart.stop="dragStart"
-									@touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-point point-t" data-drag="top" @touchstart.stop="dragStart"
-									@touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-point point-tr" data-drag="topTight"></view>
-								<view class="uni-cropper-point point-r" data-drag="right" @touchstart.stop="dragStart"
-									@touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-point point-rb" data-drag="rightBottom"
-									@touchstart.stop="dragStart" @touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-point point-b" data-drag="bottom" @touchstart.stop="dragStart"
-									@touchmove.stop="dragMove" @touchend.stop="dragEnd"></view>
-								<view class="uni-cropper-point point-bl" data-drag="bottomLeft"></view>
-								<view class="uni-cropper-point point-l" data-drag="left" @touchstart.stop="dragStart"
-									@touchmove.stop="dragMove"></view>
-								<view class="uni-cropper-point point-lt" data-drag="leftTop"></view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class='cropper-config'>
-				<button type="primary reverse" @click="getImage" style='margin-top: 30rpx;'> 选择头像 </button>
-				<button type="warn" @click="getImageInfo" style='margin-top: 30rpx;'> 提交 </button>
-			</view>
-			<canvas canvas-id="myCanvas"
-				:style="'position:absolute;border: 1px solid red; width:' + imageW + 'px;height:' + imageH + 'px;top:-9999px;left:-9999px;'"></canvas>
-		</view>
-	</view>
-</template>
-
-<script>
-import config from '@/config'
-import store from "@/store"
-import { uploadAvatar } from "@/api/system/user"
-
-const baseUrl = config.baseUrl
-let sysInfo = uni.getSystemInfoSync()
-let SCREEN_WIDTH = sysInfo.screenWidth
-let PAGE_X, // 手按下的x位置
-	PAGE_Y, // 手按下y的位置 
-	PR = sysInfo.pixelRatio, // dpi
-	T_PAGE_X, // 手移动的时候x的位置
-	T_PAGE_Y, // 手移动的时候Y的位置
-	CUT_L, // 初始化拖拽元素的left值
-	CUT_T, // 初始化拖拽元素的top值
-	CUT_R, // 初始化拖拽元素的
-	CUT_B, // 初始化拖拽元素的
-	CUT_W, // 初始化拖拽元素的宽度
-	CUT_H, //  初始化拖拽元素的高度
-	IMG_RATIO, // 图片比例
-	IMG_REAL_W, // 图片实际的宽度
-	IMG_REAL_H, // 图片实际的高度
-	DRAFG_MOVE_RATIO = 1, //移动时候的比例,
-	INIT_DRAG_POSITION = 100, // 初始化屏幕宽度和裁剪区域的宽度之差，用于设置初始化裁剪的宽度
-	DRAW_IMAGE_W = sysInfo.screenWidth // 设置生成的图片宽度
-
-export default {
-	/**
-	 * 页面的初始数据
-	 */
-	data() {
-		return {
-			imageSrc: store.getters.avatar,
-			isShowImg: false,
-			// 初始化的宽高
-			cropperInitW: SCREEN_WIDTH,
-			cropperInitH: SCREEN_WIDTH,
-			// 动态的宽高
-			cropperW: SCREEN_WIDTH,
-			cropperH: SCREEN_WIDTH,
-			// 动态的left top值
-			cropperL: 0,
-			cropperT: 0,
-
-			transL: 0,
-			transT: 0,
-
-			// 图片缩放值
-			scaleP: 0,
-			imageW: 0,
-			imageH: 0,
-
-			// 裁剪框 宽高
-			cutL: 0,
-			cutT: 0,
-			cutB: SCREEN_WIDTH,
-			cutR: '100%',
-			qualityWidth: DRAW_IMAGE_W,
-			innerAspectRadio: DRAFG_MOVE_RATIO
-		}
-	},
-	/**
-	 * 生命周期函数--监听页面初次渲染完成
-	 */
-	onReady: function () {
-		this.loadImage()
-	},
-	methods: {
-		setData: function (obj) {
-			let that = this
-			Object.keys(obj).forEach(function (key) {
-				that.$set(that.$data, key, obj[key])
-			})
-		},
-		getImage: function () {
-			var _this = this
-			uni.chooseImage({
-				success: function (res) {
-					_this.setData({
-						imageSrc: res.tempFilePaths[0],
-					})
-					_this.loadImage()
-				},
-			})
-		},
-		loadImage: function () {
-			var _this = this
-
-			uni.getImageInfo({
-				src: _this.imageSrc,
-				success: function success(res) {
-					IMG_RATIO = 1 / 1
-					if (IMG_RATIO >= 1) {
-						IMG_REAL_W = SCREEN_WIDTH
-						IMG_REAL_H = SCREEN_WIDTH / IMG_RATIO
-					} else {
-						IMG_REAL_W = SCREEN_WIDTH * IMG_RATIO
-						IMG_REAL_H = SCREEN_WIDTH
-					}
-					let minRange = IMG_REAL_W > IMG_REAL_H ? IMG_REAL_W : IMG_REAL_H
-					INIT_DRAG_POSITION = minRange > INIT_DRAG_POSITION ? INIT_DRAG_POSITION : minRange
-					// 根据图片的宽高显示不同的效果   保证图片可以正常显示
-					if (IMG_RATIO >= 1) {
-						let cutT = Math.ceil((SCREEN_WIDTH / IMG_RATIO - (SCREEN_WIDTH / IMG_RATIO - INIT_DRAG_POSITION)) / 2)
-						let cutB = cutT
-						let cutL = Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH + INIT_DRAG_POSITION) / 2)
-						let cutR = cutL
-						_this.setData({
-							cropperW: SCREEN_WIDTH,
-							cropperH: SCREEN_WIDTH / IMG_RATIO,
-							// 初始化left right
-							cropperL: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH) / 2),
-							cropperT: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH / IMG_RATIO) / 2),
-							cutL: cutL,
-							cutT: cutT,
-							cutR: cutR,
-							cutB: cutB,
-							// 图片缩放值
-							imageW: IMG_REAL_W,
-							imageH: IMG_REAL_H,
-							scaleP: IMG_REAL_W / SCREEN_WIDTH,
-							qualityWidth: DRAW_IMAGE_W,
-							innerAspectRadio: IMG_RATIO
-						})
-					} else {
-						let cutL = Math.ceil((SCREEN_WIDTH * IMG_RATIO - (SCREEN_WIDTH * IMG_RATIO)) / 2)
-						let cutR = cutL
-						let cutT = Math.ceil((SCREEN_WIDTH - INIT_DRAG_POSITION) / 2)
-						let cutB = cutT
-						_this.setData({
-							cropperW: SCREEN_WIDTH * IMG_RATIO,
-							cropperH: SCREEN_WIDTH,
-							// 初始化left right
-							cropperL: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH * IMG_RATIO) / 2),
-							cropperT: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH) / 2),
-
-							cutL: cutL,
-							cutT: cutT,
-							cutR: cutR,
-							cutB: cutB,
-							// 图片缩放值
-							imageW: IMG_REAL_W,
-							imageH: IMG_REAL_H,
-							scaleP: IMG_REAL_W / SCREEN_WIDTH,
-							qualityWidth: DRAW_IMAGE_W,
-							innerAspectRadio: IMG_RATIO
-						})
-					}
-					_this.setData({
-						isShowImg: true
-					})
-					uni.hideLoading()
-				}
-			})
-		},
-		// 拖动时候触发的touchStart事件
-		contentStartMove(e) {
-			PAGE_X = e.touches[0].pageX
-			PAGE_Y = e.touches[0].pageY
-		},
-
-		// 拖动时候触发的touchMove事件
-		contentMoveing(e) {
-			var _this = this
-			var dragLengthX = (PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO
-			var dragLengthY = (PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO
-			// 左移
-			if (dragLengthX > 0) {
-				if (this.cutL - dragLengthX < 0) dragLengthX = this.cutL
-			} else {
-				if (this.cutR + dragLengthX < 0) dragLengthX = -this.cutR
-			}
-
-			if (dragLengthY > 0) {
-				if (this.cutT - dragLengthY < 0) dragLengthY = this.cutT
-			} else {
-				if (this.cutB + dragLengthY < 0) dragLengthY = -this.cutB
-			}
-			this.setData({
-				cutL: this.cutL - dragLengthX,
-				cutT: this.cutT - dragLengthY,
-				cutR: this.cutR + dragLengthX,
-				cutB: this.cutB + dragLengthY
-			})
-
-			PAGE_X = e.touches[0].pageX
-			PAGE_Y = e.touches[0].pageY
-		},
-
-		contentTouchEnd() {
-
-		},
-
-		// 获取图片
-		getImageInfo() {
-			var _this = this
-			uni.showLoading({
-				title: '图片生成中...',
-			})
-			// 将图片写入画布
-			const ctx = uni.createCanvasContext('myCanvas')
-			ctx.drawImage(_this.imageSrc, 0, 0, IMG_REAL_W, IMG_REAL_H)
-			ctx.draw(true, () => {
-				// 获取画布要裁剪的位置和宽度   均为百分比 * 画布中图片的宽度    保证了在微信小程序中裁剪的图片模糊  位置不对的问题 canvasT = (_this.cutT / _this.cropperH) * (_this.imageH / pixelRatio)
-				var canvasW = ((_this.cropperW - _this.cutL - _this.cutR) / _this.cropperW) * IMG_REAL_W
-				var canvasH = ((_this.cropperH - _this.cutT - _this.cutB) / _this.cropperH) * IMG_REAL_H
-				var canvasL = (_this.cutL / _this.cropperW) * IMG_REAL_W
-				var canvasT = (_this.cutT / _this.cropperH) * IMG_REAL_H
-				uni.canvasToTempFilePath({
-					x: canvasL,
-					y: canvasT,
-					width: canvasW,
-					height: canvasH,
-					destWidth: canvasW,
-					destHeight: canvasH,
-					quality: 0.5,
-					canvasId: 'myCanvas',
-					success: function (res) {
-						uni.hideLoading()
-						let data = { name: 'avatarfile', filePath: res.tempFilePath }
-						uploadAvatar(data).then(response => {
-							//store.commit('SET_AVATAR', response.imgUrl)
-							/*cloud*/
-							store.commit('SET_AVATAR', baseUrl + response.imgUrl)
-							uni.showToast({ title: "修改成功", icon: 'success' })
-							uni.$emit('refresh');
-							uni.navigateBack();
-						})
-					}
-				})
-			})
-		},
-		// 设置大小的时候触发的touchStart事件
-		dragStart(e) {
-			T_PAGE_X = e.touches[0].pageX
-			T_PAGE_Y = e.touches[0].pageY
-			CUT_L = this.cutL
-			CUT_R = this.cutR
-			CUT_B = this.cutB
-			CUT_T = this.cutT
-		},
-
-		// 设置大小的时候触发的touchMove事件
-		dragMove(e) {
-			var _this = this
-			var dragType = e.target.dataset.drag
-			switch (dragType) {
-				case 'right':
-					var dragLength = (T_PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO
-					if (CUT_R + dragLength < 0) dragLength = -CUT_R
-					this.setData({
-						cutR: CUT_R + dragLength
-					})
-					break
-				case 'left':
-					var dragLength = (T_PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO
-					if (CUT_L - dragLength < 0) dragLength = CUT_L
-					if ((CUT_L - dragLength) > (this.cropperW - this.cutR)) dragLength = CUT_L - (this.cropperW - this.cutR)
-					this.setData({
-						cutL: CUT_L - dragLength
-					})
-					break
-				case 'top':
-					var dragLength = (T_PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO
-					if (CUT_T - dragLength < 0) dragLength = CUT_T
-					if ((CUT_T - dragLength) > (this.cropperH - this.cutB)) dragLength = CUT_T - (this.cropperH - this.cutB)
-					this.setData({
-						cutT: CUT_T - dragLength
-					})
-					break
-				case 'bottom':
-					var dragLength = (T_PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO
-					if (CUT_B + dragLength < 0) dragLength = -CUT_B
-					this.setData({
-						cutB: CUT_B + dragLength
-					})
-					break
-				case 'rightBottom':
-					var dragLengthX = (T_PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO
-					var dragLengthY = (T_PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO
-
-					if (CUT_B + dragLengthY < 0) dragLengthY = -CUT_B
-					if (CUT_R + dragLengthX < 0) dragLengthX = -CUT_R
-					let cutB = CUT_B + dragLengthY
-					let cutR = CUT_R + dragLengthX
-
-					this.setData({
-						cutB: cutB,
-						cutR: cutR
-					})
-					break
-				default:
-					break
-			}
-		}
-	}
-}
-</script>
-
-<style>
-/* pages/uni-cropper/index.wxss */
-
-.cropper-config {
-	padding: 20rpx 40rpx;
-}
-
-.cropper-content {
-	min-height: 750rpx;
-	width: 100%;
-}
-
-.uni-corpper {
-	position: relative;
-	overflow: hidden;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-	-webkit-tap-highlight-color: transparent;
-	-webkit-touch-callout: none;
-	box-sizing: border-box;
-}
-
-.uni-corpper-content {
-	position: relative;
-}
-
-.uni-corpper-content image {
-	display: block;
-	width: 100%;
-	min-width: 0 !important;
-	max-width: none !important;
-	height: 100%;
-	min-height: 0 !important;
-	max-height: none !important;
-	image-orientation: 0deg !important;
-	margin: 0 auto;
-}
-
-/* 移动图片效果 */
-
-.uni-cropper-drag-box {
-	position: absolute;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	cursor: move;
-	background: rgba(0, 0, 0, 0.6);
-	z-index: 1;
-}
-
-/* 内部的信息 */
-
-.uni-corpper-crop-box {
-	position: absolute;
-	background: rgba(255, 255, 255, 0.3);
-	z-index: 2;
-}
-
-.uni-corpper-crop-box .uni-cropper-view-box {
-	position: relative;
-	display: block;
-	width: 100%;
-	height: 100%;
-	overflow: visible;
-	outline: 1rpx solid #69f;
-	outline-color: rgba(102, 153, 255, .75)
-}
-
-/* 横向虚线 */
-
-.uni-cropper-dashed-h {
-	position: absolute;
-	top: 33.33333333%;
-	left: 0;
-	width: 100%;
-	height: 33.33333333%;
-	border-top: 1rpx dashed rgba(255, 255, 255, 0.5);
-	border-bottom: 1rpx dashed rgba(255, 255, 255, 0.5);
-}
-
-/* 纵向虚线 */
-
-.uni-cropper-dashed-v {
-	position: absolute;
-	left: 33.33333333%;
-	top: 0;
-	width: 33.33333333%;
-	height: 100%;
-	border-left: 1rpx dashed rgba(255, 255, 255, 0.5);
-	border-right: 1rpx dashed rgba(255, 255, 255, 0.5);
-}
-
-/* 四个方向的线  为了之后的拖动事件*/
-
-.uni-cropper-line-t {
-	position: absolute;
-	display: block;
-	width: 100%;
-	background-color: #69f;
-	top: 0;
-	left: 0;
-	height: 1rpx;
-	opacity: 0.1;
-	cursor: n-resize;
-}
-
-.uni-cropper-line-t::before {
-	content: '';
-	position: absolute;
-	top: 50%;
-	right: 0rpx;
-	width: 100%;
-	-webkit-transform: translate3d(0, -50%, 0);
-	transform: translate3d(0, -50%, 0);
-	bottom: 0;
-	height: 41rpx;
-	background: transparent;
-	z-index: 11;
-}
-
-.uni-cropper-line-r {
-	position: absolute;
-	display: block;
-	background-color: #69f;
-	top: 0;
-	right: 0rpx;
-	width: 1rpx;
-	opacity: 0.1;
-	height: 100%;
-	cursor: e-resize;
-}
-
-.uni-cropper-line-r::before {
-	content: '';
-	position: absolute;
-	top: 0;
-	left: 50%;
-	width: 41rpx;
-	-webkit-transform: translate3d(-50%, 0, 0);
-	transform: translate3d(-50%, 0, 0);
-	bottom: 0;
-	height: 100%;
-	background: transparent;
-	z-index: 11;
-}
-
-.uni-cropper-line-b {
-	position: absolute;
-	display: block;
-	width: 100%;
-	background-color: #69f;
-	bottom: 0;
-	left: 0;
-	height: 1rpx;
-	opacity: 0.1;
-	cursor: s-resize;
-}
-
-.uni-cropper-line-b::before {
-	content: '';
-	position: absolute;
-	top: 50%;
-	right: 0rpx;
-	width: 100%;
-	-webkit-transform: translate3d(0, -50%, 0);
-	transform: translate3d(0, -50%, 0);
-	bottom: 0;
-	height: 41rpx;
-	background: transparent;
-	z-index: 11;
-}
-
-.uni-cropper-line-l {
-	position: absolute;
-	display: block;
-	background-color: #69f;
-	top: 0;
-	left: 0;
-	width: 1rpx;
-	opacity: 0.1;
-	height: 100%;
-	cursor: w-resize;
-}
-
-.uni-cropper-line-l::before {
-	content: '';
-	position: absolute;
-	top: 0;
-	left: 50%;
-	width: 41rpx;
-	-webkit-transform: translate3d(-50%, 0, 0);
-	transform: translate3d(-50%, 0, 0);
-	bottom: 0;
-	height: 100%;
-	background: transparent;
-	z-index: 11;
-}
-
-.uni-cropper-point {
-	width: 5rpx;
-	height: 5rpx;
-	background-color: #69f;
-	opacity: .75;
-	position: absolute;
-	z-index: 3;
-}
-
-.point-t {
-	top: -3rpx;
-	left: 50%;
-	margin-left: -3rpx;
-	cursor: n-resize;
-}
-
-.point-tr {
-	top: -3rpx;
-	left: 100%;
-	margin-left: -3rpx;
-	cursor: n-resize;
-}
-
-.point-r {
-	top: 50%;
-	left: 100%;
-	margin-left: -3rpx;
-	margin-top: -3rpx;
-	cursor: n-resize;
-}
-
-.point-rb {
-	left: 100%;
-	top: 100%;
-	-webkit-transform: translate3d(-50%, -50%, 0);
-	transform: translate3d(-50%, -50%, 0);
-	cursor: n-resize;
-	width: 36rpx;
-	height: 36rpx;
-	background-color: #69f;
-	position: absolute;
-	z-index: 1112;
-	opacity: 1;
-}
-
-.point-b {
-	left: 50%;
-	top: 100%;
-	margin-left: -3rpx;
-	margin-top: -3rpx;
-	cursor: n-resize;
-}
-
-.point-bl {
-	left: 0%;
-	top: 100%;
-	margin-left: -3rpx;
-	margin-top: -3rpx;
-	cursor: n-resize;
-}
-
-.point-l {
-	left: 0%;
-	top: 50%;
-	margin-left: -3rpx;
-	margin-top: -3rpx;
-	cursor: n-resize;
-}
-
-.point-lt {
-	left: 0%;
-	top: 0%;
-	margin-left: -3rpx;
-	margin-top: -3rpx;
-	cursor: n-resize;
-}
-
-/* 裁剪框预览内容 */
-
-.uni-cropper-viewer {
-	position: relative;
-	width: 100%;
-	height: 100%;
-	overflow: hidden;
-}
-
-.uni-cropper-viewer image {
-	position: absolute;
-	z-index: 2;
-}
-</style>

pages/myCenter/bad.vue

@@ -64,7 +64,7 @@ const load = () => {
 
 const onAppeal = (record) => {
     uni.navigateTo({
-        url: `/pages/myCenter/appeal?id=${record.key}`
+        url: `/pages_mine/pages/appeal/index?id=${record.key}`
     })
 }
 

pages/myCenter/bankCardDetails.vue

@@ -14,14 +14,14 @@
 
 <script setup>
 import { ref } from 'vue';
-import BankItem from '../../components/bank-item/bank-item.vue';
+import BankItem from '@/components/bank-item/bank-item.vue';
 const bankList = ref([
     {
         bankCode: 'ABC',
         bankName: '中国农业银行',
         cardType: '储蓄卡',
         cardCode: '5106365986893',
-        color: 'red'
+        color: 'linear-gradient(135deg, rgba(43, 102, 248, 1) 0%, rgba(27, 69, 178, 1) 100%), rgba(0, 0, 0, 0)'
     },
 ])
 

pages_mine/pages/help/index.vue

@@ -1,109 +0,0 @@
-<template>
-  <view class="help-container">
-    <view v-for="(item, findex) in list" :key="findex" :title="item.title" class="list-title">
-      <view class="text-title">
-        <view :class="item.icon"></view>{{ item.title }}
-      </view>
-      <view class="childList">
-        <view v-for="(child, zindex) in item.childList" :key="zindex" class="question" hover-class="hover"
-          @click="handleText(child)">
-          <view class="text-item">{{ child.title }}</view>
-          <view class="line" v-if="zindex !== item.childList.length - 1"></view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup>
-	import { ref } from "vue";
-	
-	const list =ref([{
-            icon: 'iconfont icon-github',
-            title: '若依问题',
-            childList: [{
-              title: '若依开源吗？',
-              content: '开源'
-            }, {
-              title: '若依可以商用吗？',
-              content: '可以'
-            }, {
-              title: '若依官网地址多少？',
-              content: 'http://ruoyi.vip'
-            }, {
-              title: '若依文档地址多少？',
-              content: 'http://doc.ruoyi.vip'
-            }]
-          },
-          {
-            icon: 'iconfont icon-help',
-            title: '其他问题',
-            childList: [{
-              title: '如何退出登录？',
-              content: '请点击[我的] - [应用设置] - [退出登录]即可退出登录',
-            }, {
-              title: '如何修改用户头像？',
-              content: '请点击[我的] - [选择头像] - [点击提交]即可更换用户头像',
-            }, {
-              title: '如何修改登录密码？',
-              content: '请点击[我的] - [应用设置] - [修改密码]即可修改登录密码',
-            }]
-          }
-        ])
-	
-	function handleText(item) {
-		uni.navigateTo({
-			url: `/pages/common/textview/index?title=${item.title}&content=${item.content}`
-		});
-	}
-</script>
-
-<style lang="scss" scoped>
-  page {
-    background-color: #f8f8f8;
-  }
-
-  .help-container {
-    margin-bottom: 100rpx;
-    padding: 30rpx;
-  }
-
-  .list-title {
-    margin-bottom: 30rpx;
-  }
-
-  .childList {
-    background: #ffffff;
-    box-shadow: 0px 0px 10rpx rgba(193, 193, 193, 0.2);
-    border-radius: 16rpx;
-    margin-top: 10rpx;
-  }
-
-  .line {
-    width: 100%;
-    height: 1rpx;
-    background-color: #F5F5F5;
-  }
-
-  .text-title {
-    color: #303133;
-    font-size: 32rpx;
-    font-weight: bold;
-    margin-left: 10rpx;
-
-    .iconfont {
-      font-size: 16px;
-      margin-right: 10rpx;
-    }
-  }
-
-  .text-item {
-    font-size: 28rpx;
-    padding: 24rpx;
-  }
-
-  .question {
-    color: #606266;
-    font-size: 28rpx;
-  }
-</style>

pages_mine/pages/info/edit.vue

@@ -1,132 +0,0 @@
-<template>
-  <view class="container">
-    <view class="example">
-      <uni-forms ref="form" :model="user" labelWidth="80px">
-        <uni-forms-item label="用户昵称" name="nickName">
-          <uni-easyinput v-model="user.nickName" placeholder="请输入昵称" />
-        </uni-forms-item>
-        <uni-forms-item label="手机号码" name="phonenumber">
-          <uni-easyinput v-model="user.phonenumber" placeholder="请输入手机号码" />
-        </uni-forms-item>
-        <uni-forms-item label="邮箱" name="email">
-          <uni-easyinput v-model="user.email" placeholder="请输入邮箱" />
-        </uni-forms-item>
-        <uni-forms-item label="性别" name="sex" required>
-          <uni-data-checkbox v-model="user.sex" :localdata="sexs" />
-        </uni-forms-item>
-      </uni-forms>
-      <button type="primary" @click="submit">提交</button>
-    </view>
-  </view>
-</template>
-
-<script>
-import { getUserProfile } from "@/api/system/user"
-import { updateUserProfile } from "@/api/system/user"
-
-export default {
-  data() {
-    return {
-      user: {
-        nickName: "",
-        phonenumber: "",
-        email: "",
-        sex: ""
-      },
-      sexs: [{
-        text: '男',
-        value: "0"
-      }, {
-        text: '女',
-        value: "1"
-      }],
-      rules: {
-        nickName: {
-          rules: [{
-            required: true,
-            errorMessage: '用户昵称不能为空'
-          }]
-        },
-        phonenumber: {
-          rules: [{
-            required: true,
-            errorMessage: '手机号码不能为空'
-          }, {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            errorMessage: '请输入正确的手机号码'
-          }]
-        },
-        email: {
-          rules: [{
-            required: true,
-            errorMessage: '邮箱地址不能为空'
-          }, {
-            format: 'email',
-            errorMessage: '请输入正确的邮箱地址'
-          }]
-        }
-      }
-    }
-  },
-  onLoad() {
-    this.getUser()
-  },
-  onReady() {
-    this.$refs.form.setRules(this.rules)
-  },
-  methods: {
-    getUser() {
-      getUserProfile().then(response => {
-        this.user = response.data
-      })
-    },
-    submit(ref) {
-      this.$refs.form.validate().then(res => {
-        updateUserProfile(this.user).then(response => {
-          uni.showToast({
-            title: '修改成功',
-            mask: false,
-            duration: 1000
-          });
-          uni.navigateBack();
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-page {
-  background-color: #ffffff;
-}
-
-.example {
-  padding: 15px;
-  background-color: #fff;
-}
-
-.segmented-control {
-  margin-bottom: 15px;
-}
-
-.button-group {
-  margin-top: 15px;
-  display: flex;
-  justify-content: space-around;
-}
-
-.form-item {
-  display: flex;
-  align-items: center;
-  flex: 1;
-}
-
-.button {
-  display: flex;
-  align-items: center;
-  height: 35px;
-  line-height: 35px;
-  margin-left: 10px;
-}
-</style>

pages_mine/pages/info/index.vue

@@ -1,46 +0,0 @@
-<template>
-  <view class="container">
-    <uni-list>
-      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'person-filled' }" title="昵称" :rightText="user.nickName" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'phone-filled' }" title="手机号码"
-        :rightText="user.phonenumber" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'email-filled' }" title="邮箱" :rightText="user.email" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'auth-filled' }" title="岗位" :rightText="postGroup" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'staff-filled' }" title="角色" :rightText="roleGroup" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'calendar-filled' }" title="创建日期"
-        :rightText="user.createTime" />
-    </uni-list>
-  </view>
-</template>
-
-<script>
-import { getUserProfile } from "@/api/system/user"
-
-export default {
-  data() {
-    return {
-      user: {},
-      roleGroup: "",
-      postGroup: ""
-    }
-  },
-  onLoad() {
-    this.getUser()
-  },
-  methods: {
-    getUser() {
-      getUserProfile().then(response => {
-        this.user = response.data
-        this.roleGroup = response.roleGroup
-        this.postGroup = response.postGroup
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-page {
-  background-color: #ffffff;
-}
-</style>

pages_mine/pages/pwd/index.vue

@@ -1,91 +0,0 @@
-<template>
-  <view class="pwd-retrieve-container">
-    <uni-forms ref="form" :value="user" labelWidth="80px">
-      <uni-forms-item name="oldPassword" label="旧密码">
-        <uni-easyinput type="password" v-model="user.oldPassword" placeholder="请输入旧密码" />
-      </uni-forms-item>
-      <uni-forms-item name="newPassword" label="新密码">
-        <uni-easyinput type="password" v-model="user.newPassword" placeholder="请输入新密码" />
-      </uni-forms-item>
-      <uni-forms-item name="confirmPassword" label="确认密码">
-        <uni-easyinput type="password" v-model="user.confirmPassword" placeholder="请确认新密码" />
-      </uni-forms-item>
-      <button type="primary" @click="submit">提交</button>
-    </uni-forms>
-  </view>
-</template>
-
-<script>
-  import { updateUserPwd } from "@/api/system/user"
-
-  export default {
-    data() {
-      return {
-        user: {
-          oldPassword: undefined,
-          newPassword: undefined,
-          confirmPassword: undefined
-        },
-        rules: {
-          oldPassword: {
-            rules: [{
-              required: true,
-              errorMessage: '旧密码不能为空'
-            }]
-          },
-          newPassword: {
-            rules: [{
-                required: true,
-                errorMessage: '新密码不能为空',
-              },
-              {
-                minLength: 6,
-                maxLength: 20,
-                errorMessage: '长度在 6 到 20 个字符'
-              }
-            ]
-          },
-          confirmPassword: {
-            rules: [{
-                required: true,
-                errorMessage: '确认密码不能为空'
-              }, {
-                validateFunction: (rule, value, data) => data.newPassword === value,
-                errorMessage: '两次输入的密码不一致'
-              }
-            ]
-          }
-        }
-      }
-    },
-    onReady() {
-      this.$refs.form.setRules(this.rules)
-    },
-    methods: {
-      submit() {
-        this.$refs.form.validate().then(res => {
-          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
-			uni.showToast({
-			  title: '修改成功',
-			  mask: false,
-			  duration: 1000
-			});
-			uni.navigateBack();
-          })
-		  
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  page {
-    background-color: #ffffff;
-  }
-
-  .pwd-retrieve-container {
-    padding-top: 36rpx;
-    padding: 15px;
-  }
-</style>

pages_mine/pages/setting/index.vue

@@ -1,105 +0,0 @@
-<template>
-  <view class="setting-container" :style="{height: `${windowHeight}px`}">
-    <view class="menu-list">
-      <view class="list-cell list-cell-arrow" @click="handleToPwd">
-        <view class="menu-item-box">
-          <view class="iconfont icon-password menu-icon"></view>
-          <view>修改密码</view>
-        </view>
-      </view>
-      <view class="list-cell list-cell-arrow" @click="handleToUpgrade">
-        <view class="menu-item-box">
-          <view class="iconfont icon-refresh menu-icon"></view>
-          <view>检查更新</view>
-        </view>
-      </view>
-      <view class="list-cell list-cell-arrow" @click="handleCleanTmp">
-        <view class="menu-item-box">
-          <view class="iconfont icon-clean menu-icon"></view>
-          <view>清理缓存</view>
-        </view>
-      </view>
-    </view>
-    <view class="cu-list menu">
-      <view class="cu-item item-box">
-        <view class="content text-center" @click="handleLogout">
-          <text class="text-black">退出登录</text>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view>
-  	  <uni-popup ref="popup" type="dialog">
-  	    <uni-popup-dialog type="info" cancelText="关闭" confirmText="退出"
-  	                      title="通知" content="确定注销并退出系统吗" 
-  	    				  @confirm="dialogConfirm"
-  	                      @close="dialogClose">
-  	    </uni-popup-dialog>
-  	  </uni-popup>
-  </view>
-</template>
-
-<script setup>
-  import { ref } from "vue";
-  import store from '@/store'
-  
-  const windowHeight=ref(uni.getSystemInfoSync().windowHeight) ;
-  const popup = ref(null);
-  
-  function handleToPwd() {
-	  uni.navigateTo({
-	  	url: '/pages/mine/pwd/index'
-	  });
-  };
-  
-  function handleToUpgrade() {
-	  uni.showToast({
-	    title: '模块建设中~',
-	    mask: false,
-	  	icon:"none",
-	    duration: 1000
-	  });
-  };
-  
-  function handleCleanTmp() {
-    uni.showToast({
-      title: '模块建设中~',
-      mask: false,
-    	icon:"none",
-      duration: 1000
-    });
-  };
-  function handleLogout() {
-  	  popup.value.open();
-  };
-  function dialogConfirm() {
-  	//console.log('----------------点击确认------------')
-  	store.dispatch('LogOut').then(() => {
-  			uni.reLaunch({
-  				url: '/pages/login'
-  			});
-  	})
-  };
-  function dialogClose() {
-  	//console.log('点击关闭')
-  };
-</script>
-
-<style lang="scss" scoped>
-  .page {
-    background-color: #f8f8f8;
-  }
-
-  .item-box {
-    background-color: #FFFFFF;
-    margin: 30rpx;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    padding: 10rpx;
-    border-radius: 8rpx;
-    color: #303133;
-    font-size: 32rpx;
-  }
-</style>

pages/myCenter/wallet.vue

@@ -43,45 +43,45 @@
 
 <script setup>
 import { ref } from 'vue';
-import BankItem from '../../components/bank-item/bank-item.vue';
+import BankItem from '@/components/bank-item/bank-item.vue';
 const bankList = ref([
     {
         bankCode: 'ABC',
         bankName: '中国农业银行',
         cardType: '储蓄卡',
         cardCode: '5106365986893',
-        color: 'red'
+        color: 'linear-gradient(135deg, rgba(43, 102, 248, 1) 0%, rgba(27, 69, 178, 1) 100%), rgba(0, 0, 0, 0)'
     },
     {
         bankCode: 'ABC',
         bankName: '中国农业银行',
         cardType: '储蓄卡',
         cardCode: '5106365986893',
-        color: 'red'
+        color: 'linear-gradient(135deg, rgba(43, 102, 248, 1) 0%, rgba(27, 69, 178, 1) 100%), rgba(0, 0, 0, 0)'
     },
 ])
 
 const onWithdrawal = () => {
     uni.navigateTo({
-        url: '/pages/myCenter/withdrawal'
+        url: '/pages_mine/pages/withdrawal/index'
     })
 }
 
 const onIncome = () => {
     uni.navigateTo({
-        url: '/pages/myCenter/income'
+        url: '/pages_mine/pages/income/index'
     })
 }
 
 const onAddBankCard = () => {
     uni.navigateTo({
-        url: '/pages/myCenter/addBankCard'
+        url: '/pages_mine/pages/addBankCard/index'
     })
 }
 
 const onBankCardDetails = (record) => {
     uni.navigateTo({
-        url: '/pages/myCenter/bankCardDetails'
+        url: '/pages_mine/pages/bankCardDetails/index'
     })
 }
 

pages/talk/pages/index/index.vue

@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import { getHistoryMsg } from "@/pages/talk/request/template-talk/history-msg.js";
+import { getHistoryMsg } from "@/pages_orderuser/pages/talk/request/template-talk/history-msg.js";
 export default {
 	data() {
 		return {

store/modules/user.ts

@@ -15,7 +15,8 @@ const user: Module<UserState, UserState> = {
     avatar: storage.get(constant.avatar),
     roles: storage.get(constant.roles),
     permissions: storage.get(constant.permissions),
-	userOrWorker: storage.get(constant.userOrWorker)
+	  userOrWorker: storage.get(constant.userOrWorker),
+    nickName:  storage.get(constant.nickName)
   },
   mutations: {
     SET_TOKEN: (state, token: string) => {
@@ -37,10 +38,14 @@ const user: Module<UserState, UserState> = {
       state.permissions = permissions
       storage.set(constant.permissions, permissions)
     },
-	SET_USERORWORKER: (state, userOrWorker: Array<string>) => {
-	  state.userOrWorker = userOrWorker
-	  storage.set(constant.userOrWorker, userOrWorker)
-	}
+    SET_USERORWORKER: (state, userOrWorker: Array<string>) => {
+      state.userOrWorker = userOrWorker
+      storage.set(constant.userOrWorker, userOrWorker)
+    },
+    SET_NICKNAME: (state, nickName: String) => {
+      state.nickName = nickName
+      storage.set(constant.nickName, nickName)
+    }
   },
 
   actions: {
@@ -83,6 +88,7 @@ const user: Module<UserState, UserState> = {
 		  
           commit('SET_NAME', username)
           commit('SET_AVATAR', avatar)
+          commit('SET_NICKNAME', res.user.nickName)
           resolve(res)
         }).catch(error => {
           reject(error)

utils/constant.ts

@@ -3,7 +3,8 @@ const constant = {
    name: 'vuex_name',
    roles: 'vuex_roles',
    permissions: 'vuex_permissions',
-   userOrWorker: 'vuex_userOrWorker'
+   userOrWorker: 'vuex_userOrWorker',
+   nickName: 'vuex_nickName',
  }
 
  export default constant