fix old pages

src/api/system/dict/data.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询字典数据列表
 export function listData(query) {
   return request({
-    url: '/system/dict/data/list',
+    url: '/admin-api/system/dict/data/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listData(query) {
 // 查询字典数据详细
 export function getData(dictCode) {
   return request({
-    url: '/system/dict/data/' + dictCode,
+    url: '/admin-api/system/dict/data/' + dictCode,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getData(dictCode) {
 // 根据字典类型查询字典数据信息
 export function getDicts(dictType) {
   return request({
-    url: '/system/dict/data/type/' + dictType,
+    url: '/admin-api/system/dict/data/type/' + dictType,
     method: 'get'
   })
 }
@@ -28,7 +28,7 @@ export function getDicts(dictType) {
 // 新增字典数据
 export function addData(data) {
   return request({
-    url: '/system/dict/data',
+    url: '/admin-api/system/dict/data',
     method: 'post',
     data: data
   })
@@ -37,7 +37,7 @@ export function addData(data) {
 // 修改字典数据
 export function updateData(data) {
   return request({
-    url: '/system/dict/data',
+    url: '/admin-api/system/dict/data',
     method: 'put',
     data: data
   })
@@ -46,7 +46,7 @@ export function updateData(data) {
 // 删除字典数据
 export function delData(dictCode) {
   return request({
-    url: '/system/dict/data/' + dictCode,
+    url: '/admin-api/system/dict/data/' + dictCode,
     method: 'delete'
   })
 }

src/api/system/dict/type.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询字典类型列表
 export function listType(query) {
   return request({
-    url: '/system/dict/type/list',
+    url: '/admin-api/system/dict/type/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listType(query) {
 // 查询字典类型详细
 export function getType(dictId) {
   return request({
-    url: '/system/dict/type/' + dictId,
+    url: '/admin-api/system/dict/type/' + dictId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getType(dictId) {
 // 新增字典类型
 export function addType(data) {
   return request({
-    url: '/system/dict/type',
+    url: '/admin-api/system/dict/type',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addType(data) {
 // 修改字典类型
 export function updateType(data) {
   return request({
-    url: '/system/dict/type',
+    url: '/admin-api/system/dict/type',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateType(data) {
 // 删除字典类型
 export function delType(dictId) {
   return request({
-    url: '/system/dict/type/' + dictId,
+    url: '/admin-api/system/dict/type/' + dictId,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delType(dictId) {
 // 刷新字典缓存
 export function refreshCache() {
   return request({
-    url: '/system/dict/type/refreshCache',
+    url: '/admin-api/system/dict/type/refreshCache',
     method: 'delete'
   })
 }
@@ -54,7 +54,7 @@ export function refreshCache() {
 // 获取字典选择框列表
 export function optionselect() {
   return request({
-    url: '/system/dict/type/optionselect',
+    url: '/admin-api/system/dict/type/optionselect',
     method: 'get'
   })
 }

src/api/system/user.js

@@ -8,7 +8,7 @@ export function updateUserPwd(oldPassword, newPassword) {
     newPassword
   }
   return request({
-    url: '/system/user/profile/updatePwd',
+    url: '/admin-api/system/user/profile/update-password',
     method: 'put',
     params: data
   })
@@ -17,7 +17,7 @@ export function updateUserPwd(oldPassword, newPassword) {
 // 查询用户个人信息
 export function getUserProfile() {
   return request({
-    url: '/system/user/profile',
+    url: '/admin-api/system/user/profile/get',
     method: 'get'
   })
 }
@@ -25,7 +25,7 @@ export function getUserProfile() {
 // 修改用户个人信息
 export function updateUserProfile(data) {
   return request({
-    url: '/system/user/profile',
+    url: '/admin-api/system/user/profile/update',
     method: 'put',
     data: data
   })
@@ -34,7 +34,7 @@ export function updateUserProfile(data) {
 // 用户头像上传
 export function uploadAvatar(data) {
   return upload({
-    url: '/system/user/profile/avatar',
+    url: '/admin-api/system/user/profile/update-avatar',
     name: data.name,
     filePath: data.filePath
   })

src/config.js

@@ -1,7 +1,7 @@
 // 应用全局配置
 const config = {
   // baseUrl: 'http://47.106.185.127:48080',127.0.0.1
-  baseUrl: 'http://127.0.0.1:48080',
+  baseUrl: 'http://47.106.185.127:48080',
    // 应用信息
    appInfo: {
      // 应用名称

src/pages.json

@@ -30,12 +30,7 @@
         "navigationBarTitleText": "工作台"
       }
     },
-    {
-      "path": "pages/template",
-      "style": {
-        "navigationBarTitleText": "模板"
-      }
-    },
+
     {
       "path": "pages/mine",
       "style": {
@@ -294,12 +289,6 @@
 	    "selectedIconPath": "static/images/tabbar/work_.png",
 	    "text": "投料"
 	  },
-      {
-        "pagePath": "pages/template",
-        "iconPath": "static/images/tabbar/work.png",
-        "selectedIconPath": "static/images/tabbar/work_.png",
-        "text": "模板"
-      },
       {
         "pagePath": "pages/mine",
         "iconPath": "static/images/tabbar/mine.png",

src/pages/mine.vue

@@ -27,21 +27,21 @@
 
     <view class="content-section">
       <view class="mine-actions grid col-4 text-center">
-        <view class="action-item" @click="handleJiaoLiuQun">
-          <view class="iconfont icon-friendfill text-pink icon"></view>
-          <text class="text">交流群</text>
+        <view class="action-item" @click="handleBuilding">
+          <view class="iconfont icon-friendfill text-green icon"></view>
+          <text class="text">反馈中心</text>
         </view>
         <view class="action-item" @click="handleBuilding">
           <view class="iconfont icon-service text-blue icon"></view>
           <text class="text">在线客服</text>
         </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-community text-mauve icon"></view>
-          <text class="text">反馈社区</text>
+        <view class="action-item" @click="handleToPwd">
+          <view class="iconfont icon-password text-mauve icon"></view>
+          <text class="text">修改密码</text>
         </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-dianzan text-green icon"></view>
-          <text class="text">点赞我们</text>
+        <view class="action-item" @click="handleLogout">
+          <view class="iconfont icon-logout text-red icon"></view>
+          <text class="text">退出登录</text>
         </view>
       </view>
 
@@ -71,7 +71,14 @@
           </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>
   </view>
 
@@ -125,7 +132,6 @@ function handleLogout() {
 };
 function dialogConfirm() {
   //console.log('----------------点击确认------------')
-
   userStore.logOut().then(() => {
     uni.reLaunch({
       url: '/pages/login'
@@ -135,6 +141,11 @@ function dialogConfirm() {
 function dialogClose() {
   //console.log('点击关闭')
 };
+function handleToPwd() {
+  uni.navigateTo({
+    url: '/pages_mine/pages/pwd/index'
+  });
+}
 function handleHelp() {
   uni.navigateTo({
     url: '/pages_mine/pages/help/index'
@@ -144,15 +155,7 @@ function handleAbout() {
   uni.navigateTo({
     url: '/pages_mine/pages/about/index'
   });
-};
-function handleJiaoLiuQun() {
-  uni.showToast({
-    title: 'QQ群：133713780',
-    mask: false,
-    icon: "none",
-    duration: 1000
-  });
-};
+}
 function handleBuilding() {
   uni.showToast({
     title: '模块建设中~',

src/pages_mine/pages/info/edit.vue

@@ -3,10 +3,10 @@
     <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-easyinput v-model="user.nickname" placeholder="请输入昵称" />
         </uni-forms-item>
         <uni-forms-item label="手机号码" name="phonenumber">
-          <uni-easyinput v-model="user.phonenumber" placeholder="请输入手机号码" />
+          <uni-easyinput v-model="user.mobile" placeholder="请输入手机号码" />
         </uni-forms-item>
         <uni-forms-item label="邮箱" name="email">
           <uni-easyinput v-model="user.email" placeholder="请输入邮箱" />
@@ -28,26 +28,26 @@ export default {
   data() {
     return {
       user: {
-        nickName: "",
-        phonenumber: "",
+        nickname: "",
+        mobile: "",
         email: "",
         sex: ""
       },
       sexs: [{
         text: '男',
-        value: "0"
+        value: 1
       }, {
         text: '女',
-        value: "1"
+        value: 2
       }],
       rules: {
-        nickName: {
+        nickname: {
           rules: [{
             required: true,
             errorMessage: '用户昵称不能为空'
           }]
         },
-        phonenumber: {
+        mobile: {
           rules: [{
             required: true,
             errorMessage: '手机号码不能为空'

src/pages_mine/pages/info/index.vue

@@ -1,17 +1,19 @@
 <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: 'contact' }" title="用户名称" :rightText="user.email" />
+      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'person-filled' }" title="昵称" :rightText="user.nickname" />
+      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'sex' }" title="性别"
+                     :rightText="user.sex===2?'女' : '男'" />
+      <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'phone-filled' }" title="手机号码" :rightText="user.mobile" />
       <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: '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" />
+        :rightText="timestampToTime(user.createTime)" />
     </uni-list>
 
-    <u-button @click="register()">绑定微信</u-button>
+
   </view>
 </template>
 
@@ -19,15 +21,15 @@
 import { getUserProfile } from "@/api/system/user"
 import { ref } from "vue";
 import modal from "@/plugins/modal"
-
+import {timestampToTime} from "@/utils/dateUtil";
 const user = ref({})
 const roleGroup = ref("")
 const postGroup = ref("")
 function getUser() {
   getUserProfile().then(response => {
     user.value = response.data
-    roleGroup.value = response.roleGroup
-    postGroup.value = response.postGroup
+    // roleGroup.value = user.value.roles
+    // postGroup.value = user.value.posts
   })
 }
 getUser()
@@ -35,12 +37,12 @@ getUser()
 import { wxRegister } from "@/api/oauth"
 import { getWxCode } from "@/utils/geek"
 function register(){
-  modal.loading('绑定微信中...')
-  getWxCode().then(res=>{
-    wxRegister('miniapp',res).then(res=>{
-      modal.closeLoading()
-    })
-  })
+  // modal.loading('绑定微信中...')
+  // getWxCode().then(res=>{
+  //   wxRegister('miniapp',res).then(res=>{
+  //     modal.closeLoading()
+  //   })
+  // })
   
 }
 

src/pages_mine/pages/pwd/index.vue

@@ -1,13 +1,13 @@
 <template>
   <view class="pwd-retrieve-container">
     <uni-forms ref="form" :value="user" labelWidth="80px">
-      <uni-forms-item name="oldPassword" label="旧密码">
+      <uni-forms-item required name="oldPassword" label="旧密码">
         <uni-easyinput type="password" v-model="user.oldPassword" placeholder="请输入旧密码" />
       </uni-forms-item>
-      <uni-forms-item name="newPassword" label="新密码">
+      <uni-forms-item required name="newPassword" label="新密码">
         <uni-easyinput type="password" v-model="user.newPassword" placeholder="请输入新密码" />
       </uni-forms-item>
-      <uni-forms-item name="confirmPassword" label="确认密码">
+      <uni-forms-item required name="confirmPassword" label="确认密码">
         <uni-easyinput type="password" v-model="user.confirmPassword" placeholder="请确认新密码" />
       </uni-forms-item>
       <button type="primary" @click="submit">提交</button>

src/pages_mine/pages/setting/index.vue

@@ -47,7 +47,7 @@ const popup = ref(null);
 
 function handleToPwd() {
   uni.navigateTo({
-    url: '/pages/mine/pwd/index'
+    url: '/pages_mine/pages/pwd/index'
   });
 };