页面调整

property_ui/manage/components/zb-table/zb-tables.vue

@@ -121,10 +121,10 @@
                   <template v-else-if="ite.type==='img'">
                     <view class="checkbox-item">
 						<block v-if="item[ite.name]" >
-							<image v-for="(pite,pidx) in getPhotoFn(item[ite.name])" :key="pidx"
+							<!-- <image v-for="(pite,pidx) in getPhotoFn(item[ite.name])" :key="pidx"
 							    @click.stop="previewImage(getPhotoFn(item[ite.name]),pite,pidx)"
 							    :show-menu-by-longpress="false"
-							    :src="pite" style="width: 80rpx;height:60rpx; " mode="aspectFit"></image>
+							    :src="pite" style="width: 80rpx;height:60rpx; " mode="aspectFit"></image> -->
 						</block>
                       <!-- <image
                     @click.stop="previewImage(item,item[ite.name],index)"
@@ -361,10 +361,10 @@
                   </template>
                   <template v-else-if="ite.type==='img'">
 					<block v-if="item[ite.name]" >
-						<image v-for="(pite,pidx) in getPhotoFn(item[ite.name])" :key="pidx"
+						<!-- <image v-for="(pite,pidx) in getPhotoFn(item[ite.name])" :key="pidx"
 						    @click.stop="previewImage(getPhotoFn(item[ite.name]),pite,pidx)"
 						    :show-menu-by-longpress="false"
-						    :src="pite" style="width: 80rpx;height:60rpx; " mode="aspectFit"></image>
+						    :src="pite" style="width: 80rpx;height:60rpx; " mode="aspectFit"></image> -->
 					</block>
                     <text v-else>{{ite.emptyString}}</text>
                   </template>

property_ui/manifest.json

@@ -80,12 +80,19 @@
             "urlCheck" : false,
             "es6" : false,
             "minified" : true,
-            "postcss" : true
+            "postcss" : true,
+            "minifyWXML" : true,
+            "checkSiteMap" : false
         },
         "optimization" : {
             "subPackages" : true
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取当前位置"
+            }
+        }
     },
     "vueVersion" : "2",
     "h5" : {

property_ui/pages/mine/info.vue → property_ui/mine/pages/info.vue

@@ -117,7 +117,7 @@
 				if(this.isdisabled){
 					return
 				}
-				this.$tab.navigateTo('/pages/mine/avatar/index')
+				this.$tab.navigateTo('/mine/pages/avatar/index')
 			},
 			statusFormats(data, list,type) {
 				var aite=selectValueKey(list, data);

property_ui/pages/mine/pwd/forgetpwd.vue → property_ui/mine/pages/pwd/forgetpwd.vue

@@ -90,7 +90,7 @@
 			that.$toast("请输入正确的手机号")
 			return
 		}
-		this.$tab.navigateTo(`/pages/mine/pwd/resetpwd?phone=`+this.phonenumber+'&code='+this.code)
+		this.$tab.navigateTo(`/mine/pages/pwd/resetpwd?phone=`+this.phonenumber+'&code='+this.code)
       }
     }
   }

property_ui/pages.json

@@ -7,17 +7,6 @@
 	  	  "navigationStyle": "custom"
 	    }
 	  }, 
-	  {
-	  	  "path": "pages/mine/pwd/forgetpwd",
-	  	  "style": {
-	  	    "navigationBarTitleText": "忘记密码"
-	  	  }
-	  	}, {
-	  	  "path": "pages/mine/pwd/resetpwd",
-	  	  "style": {
-	  	    "navigationBarTitleText": "重置密码"
-	  	  }
-	  },
 	  {
 	    "path": "pages/index/index",
 	    "style": {
@@ -52,13 +41,6 @@
     "style": {
       "navigationBarTitleText": "用户协议及隐私条款"
     }
-  },
-  {
-    "path": "pages/mine/info",
-    "style": {
-      "navigationBarTitleText": "个人信息",
-  	  "h5":{"titleNView":false}
-    }
   },
    {
     "path": "pages/mine/index",
@@ -66,41 +48,6 @@
       "navigationBarTitleText": "我的",
 	   "navigationStyle": "custom"
     }
-  }, {
-    "path": "pages/mine/avatar/index",
-    "style": {
-      "navigationBarTitleText": "修改头像"
-    }
-  }, {
-    "path": "pages/mine/info/index",
-    "style": {
-      "navigationBarTitleText": "个人信息"
-    }
-  }, {
-    "path": "pages/mine/info/edit",
-    "style": {
-      "navigationBarTitleText": "编辑资料"
-    }
-  }, {
-    "path": "pages/mine/pwd/index",
-    "style": {
-      "navigationBarTitleText": "修改密码"
-    }
-  }, {
-    "path": "pages/mine/setting/index",
-    "style": {
-      "navigationBarTitleText": "应用设置"
-    }
-  }, {
-    "path": "pages/mine/help/index",
-    "style": {
-      "navigationBarTitleText": "常见问题"
-    }
-  }, {
-    "path": "pages/mine/about/index",
-    "style": {
-      "navigationBarTitleText": "关于我们"
-    }
   }, {
     "path": "pages/common/webview/index",
     "style": {
@@ -229,6 +176,45 @@
 				"h5":{"titleNView":false}
 			  }
 			},
+			{
+			  "path": "pages/info",
+			  "style": {
+			    "navigationBarTitleText": "个人信息",
+				  "h5":{"titleNView":false}
+			  }
+			},
+			{
+				"path": "pages/pwd/forgetpwd",
+				"style": {
+					"navigationBarTitleText": "忘记密码"
+				}
+				}, {
+				"path": "pages/pwd/resetpwd",
+				"style": {
+				    "navigationBarTitleText": "重置密码"
+				}
+			},
+			{
+			  "path": "pages/avatar/index",
+			  "style": {
+			    "navigationBarTitleText": "修改头像"
+			  }
+			}, {
+			  "path": "pages/info/index",
+			  "style": {
+			    "navigationBarTitleText": "个人信息"
+			  }
+			}, {
+			  "path": "pages/info/edit",
+			  "style": {
+			    "navigationBarTitleText": "编辑资料"
+			  }
+			}, {
+			  "path": "pages/pwd/index",
+			  "style": {
+			    "navigationBarTitleText": "修改密码"
+			  }
+			},
 			{
 			  "path": "pages/news/sh",
 			  "style": {

property_ui/pages/mine/about/index.vue

@@ -1,75 +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>
-  export default {
-    data() {
-      return {
-        url: getApp().globalData.config.appInfo.site_url,
-        version: getApp().globalData.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>

property_ui/pages/mine/help/index.vue

@@ -1,112 +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>
-  export default {
-    data() {
-      return {
-        list: [{
-            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: '请点击[我的] - [应用设置] - [修改密码]即可修改登录密码',
-            }]
-          }
-        ]
-      }
-    },
-    methods: {
-      handleText(item) {
-        this.$tab.navigateTo(`/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>

property_ui/pages/mine/index.vue

@@ -248,7 +248,6 @@
 			},
 			// 设置
 			handleToSetting() {
-			  this.$tab.navigateTo('/pages/mine/setting/index')
 			},
 			handleDjAdd(){//党建发布
 				this.$tab.navigateTo('/manage/pages/community/newsadddj')
@@ -279,18 +278,18 @@
 			},
 			// 修改密码
 			handleUpassword(){
-				this.$tab.navigateTo(`/pages/mine/pwd/index`)  
+				this.$tab.navigateTo(`/mine/pages/pwd/index`)  
 			},
 			// 账号信息
 			handleToInfo() {
 				// this.$tab.navigateTo('/pages/mine/info/index')
-				this.$tab.navigateTo('/pages/mine/info')
+				this.$tab.navigateTo('/mine/pages/info')
 			},
 			handleToLogin() {
 				this.$tab.reLaunch('/pages/login')
 			},
 			handleToAvatar() {
-				this.$tab.navigateTo('/pages/mine/avatar/index')
+				this.$tab.navigateTo('/mine/pages/avatar/index')
 			},
 			handleLogout() {
 				this.$modal.confirm('确定注销并退出系统吗？').then(() => {

property_ui/pages/mine/setting/index.vue

@@ -1,78 +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>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        windowHeight: uni.getSystemInfoSync().windowHeight
-      }
-    },
-    methods: {
-      handleToPwd() {
-        this.$tab.navigateTo('/pages/mine/pwd/index')
-      },
-      handleToUpgrade() {
-        this.$modal.showToast('模块建设中~')
-      },
-      handleCleanTmp() {
-        this.$modal.showToast('模块建设中~')
-      },
-      handleLogout() {
-        this.$modal.confirm('确定注销并退出系统吗？').then(() => {
-          this.$store.dispatch('LogOut').then(() => {
-            this.$tab.reLaunch('/pages/index/index')
-          })
-        })
-      }
-    }
-  }
-</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>

property_ui/pages/tlogin.vue

@@ -150,10 +150,7 @@
 		  })
 		},
 		getForget(){
-			this.$tab.navigateTo(`/pages/mine/pwd/forgetpwd`)
-		},
-		getSchoolFn(){
-			this.$tab.navigateTo(`/mine/pages/mine/school?id=`+this.loginForm.school)
+			this.$tab.navigateTo(`/mine/pages/pwd/forgetpwd`)
 		},
 		 getregister(){
 			 this.$tab.redirectTo(`/pages/register`)

property_ui/permission.js

@@ -5,7 +5,7 @@ const loginPage = "/pages/login"
   
 // 页面白名单
 const whiteList = ['/pages/index/index','/pages/agreement',
-  '/pages/login','/pages/tlogin', '/pages/register', '/pages/common/webview/index','/pages/mine/pwd/resetpwd','/pages/mine/pwd/forgetpwd',
+  '/pages/login','/pages/tlogin', '/pages/register', '/pages/common/webview/index','/mine/pages/pwd/resetpwd','/mine/pages/pwd/forgetpwd',
 ]
 
 // 检查地址白名单

property_ui/service/components/popup/voice.vue

@@ -27,7 +27,12 @@
 				<view v-if="!sendLock" class="tipbox">{{voicetext}}</view>
 				<view v-html="text" class="txt" style="color: #8e8d9a;"></view>
 				<view v-if="!sendLock" class="prompt-loader">
-					<view class="em" :style="randomRgb()" v-for="(item,index) in 30" :key="index"></view>
+					<!-- #ifndef MP-WEIXIN -->
+					<view class="em"  :style="randomRgb()" v-for="(item,index) in 30" :key="index"></view>
+					<!-- #endif -->
+					<!-- #ifdef MP-WEIXIN -->
+						<view class="em" :style="'background-color:' +colors[index]+';'" v-for="(item,index) in 30" :key="index"></view>
+					<!-- #endif -->
 				</view>
 				<view v-else class="prompt-loader"></view>
 			</view>
@@ -102,8 +107,18 @@
 				voicetext:'',
 				options: {}, // 语音转文字的设置
 				partialResult:'',//临时语音
+				colors: [],
 			}
 		},
+		onLoad: function() {
+		    const colors = [];
+		    for (let i = 0; i < 30; i++) { // 假设你想为30个元素生成颜色
+		      colors.push(this.randomRgb());
+		    }
+		    this.setData({
+		      colors: colors
+		    });
+		  },
 		mounted() {
 			// if(!this.xmmc){
 			// 	this.xmmc=this.name
@@ -209,9 +224,8 @@
 				let R = Math.floor(Math.random() * 130 + 110);
 				let G = Math.floor(Math.random() * 130 + 110);
 				let B = Math.floor(Math.random() * 130 + 110);
-				return {
-					background: `rgb(${R},${G},${B}, 1)`
-				};
+				return `rgb(${R},${G},${B}, 1)`
+				// background: `rgb(${R},${G},${B}, 1)`
 			},
 			// 语音转文字
 			getSeep(){

property_ui/utils/request.js

@@ -4,7 +4,7 @@ import config from '@/config'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { toast, showConfirm, tansParams } from '@/utils/common'
-import vues from '@/main.js'
+// import vues from '@/main.js'
 let timeout = 60000
 const baseUrl = config.baseUrl
 var confirmflag = config.confirmflag
@@ -34,7 +34,8 @@ const request = config => {
 	  	title:"加载中"
 	  })
   }else{
-	vues.$loading(true)  
+	// vues.$loading(true)  
+	store.commit("switch_loading",true);
   }
   return new Promise((resolve, reject) => {
     uni.request({
@@ -46,7 +47,8 @@ const request = config => {
         dataType: 'json'
       }).then(response => {
 		uni.hideLoading()
-		vues.$loading(false)
+		// vues.$loading(false)
+		store.commit("switch_loading",false);
         let [error, res] = response
         if (error) {
           toast('后端接口连接异常')
@@ -56,9 +58,9 @@ const request = config => {
         const code = res.data.code || 200
         const msg = errorCode[code] || res.data.msg || errorCode['default']
         if (code === 401) {
-          uni.showLoading({
-          	title: '加载中'
-          });
+          // uni.showLoading({
+          // 	title: '加载中'
+          // });
           if(confirmflag){
           	// 利用 return 终止函数继续运行
           	return false;
@@ -137,7 +139,8 @@ const request = config => {
       .catch(error => {
 		  if(config.lhide){
 		  }else{
-		  	vues.$loading(false)  
+			store.commit("switch_loading",false);
+		  	// vues.$loading(false)  
 		  }
 		uni.hideLoading()
         let { message } = error