liwei2496 2 vuotta sitten
vanhempi
commit
1f94770e2c

+ 11 - 0
directive/permission.js

@@ -1,5 +1,16 @@
 //先获取本地权限数据 permissions 
 let btnPermission = (data) => {
+	//  console.log('999999999',uni.getStorageSync('ButtonPermissions'))
+	  // uni.getStorage({
+	  // 	key: 'ButtonPermissions',
+	  // 	success: function (res) {
+	  // 		console.log(res.data);
+			
+			// let permissions = res.data;
+			// let isHave = permissions.includes(data);
+			// return isHave;
+	  // 	}
+	  // });
 	let permissions = uni.getStorageSync('ButtonPermissions');
 	let isHave = permissions.includes(data);
 	return isHave;

+ 1 - 0
main.js

@@ -37,6 +37,7 @@ try {
 //Vue.use(Permission)
 
 import btnPermission from './directive/permission.js';
+
 Vue.prototype.$has = btnPermission;
 
 

+ 11 - 2
manifest.json

@@ -17,7 +17,9 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Payment" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -47,7 +49,14 @@
             },
             /* SDK配置 */
             "sdkConfigs" : {
-                "ad" : {}
+                "ad" : {},
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "",
+                        "UniversalLinks" : ""
+                    }
+                }
             },
             "icons" : {
                 "android" : {

+ 9 - 0
pages.json

@@ -239,6 +239,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/index/BillPending/BillPending",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "账单详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

+ 3 - 3
pages/Workorder/pay/pay.vue

@@ -1,7 +1,7 @@
 <template>
-	<view>
-		
-	</view>
+	<view class="OutermostLayer">
+			555555555555
+		</view>
 </template>
 
 <script>

+ 19 - 0
pages/index/BillPending/BillPending.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

+ 36 - 5
pages/index/index.vue

@@ -95,6 +95,7 @@
 				</view>
 			</view>
 		</view>
+		<!-- 管理员界面 -->
 		<view class="arrears" v-if="$has('app:ArrearstobeCollected')">
 			<view class="pending_middle">
 				<view class="all"  v-if="$has('app:ImmediateCollection')">
@@ -120,12 +121,39 @@
 						<t-td>{{ item.name }}</t-td>
 						<t-td>{{ item.tenant }}</t-td>
 						<t-td>{{ item.arrears }}</t-td>
-
-
 					</t-tr>
 				</t-table>
 			</view>
 		</view>
+	<!-- 	租户界面 -->
+		<view class="arrears" v-if="$has('app:BillPending')">
+			<view class="pending_middle">
+				<view class="all"  v-if="$has('app:ImmediatePayment')">
+					<view class="work">
+						<span style="font-size: 30rpx;font-weight: bold;">账单待缴</span>
+					</view>
+					<view class="processing">
+						<view class="immediately" @click="Immediatecollection">
+							<span style="font-size: 25rpx; color: #5c8fff; ">立即缴费</span>
+							<u-icon name="arrow-right" color="#5c8fff" size="16rpx"></u-icon>
+						</view>
+					</view>
+				</view>
+				<t-table style="background-color: #fff;margin-top: 10rpx;">
+					<t-tr>
+						<t-th>欠费类型</t-th>
+						<t-th>本期待缴金额(元)</t-th>
+						<t-th>累计待缴金额(元)</t-th>
+					</t-tr>
+					<t-tr v-for="item in tableList" :key="item.name">
+						<t-td>{{ item.name }}</t-td>
+						<t-td>{{ item.currentAmount }}</t-td>
+						<t-td>{{ item.cumulativeAmount }}</t-td>
+					</t-tr>
+				</t-table>
+			</view>
+		</view>
+		
 	</view>
 </template>
 
@@ -150,14 +178,14 @@
 				tabbardata: 0,
 				workList: {}, //工单代办
 				deviceArr: {}, //设备异常数据
-
+getuserInfo:{},
 
 			}
 		},
 		onLoad() {
 			this.getalldata();
-			
-		
+			this.getuserInfo = uni.getStorageSync('getuserInfo');
+		  console.log('111111111111111111',this.getuserInfo)
 		},
 		methods: {
 			getalldata() {
@@ -180,6 +208,9 @@
 							json.name = item.payType;
 							json.tenant = item.arrearageNum;
 							json.arrears = item.arrearageAmount;
+							
+								json.currentAmount = item.currentAmount;
+								json.cumulativeAmount = item.cumulativeAmount;
 							return json
 						})
 

+ 15 - 10
pages/login/login.vue

@@ -107,9 +107,9 @@
 
 							uni.setStorageSync('tokendata', res.data.data.token); //token
 							uni.setStorageSync('Userinformation', formData); //用户信息
-							
+
 							//获取用户的信息,如组织架构,个人信息,权限等
-							Promise.all([this.getpermissions(), this.getDictList()]).then(() => {
+							Promise.all([this.getpermissions(), this.getDictList(), this.getuserInfo(), ]).then(() => {
 
 								uni.switchTab({
 									url: '/pages/index/index',
@@ -135,12 +135,11 @@
 			getpermissions() {
 				console.log('权限功能', )
 				//获取用户权限功能
-									 this.$api.get('/menu/permissions', {})
-									 .then(res1=>{
-										   console.log('111111111111111111',res1)  
-									 	uni.setStorageSync('ButtonPermissions', res1.data.data);//权限列表
-										
-									 })
+				this.$api.get('/menu/permissions', {})
+					.then(res1 => {
+						uni.setStorageSync('ButtonPermissions', res1.data.data); //权限列表
+
+					})
 			},
 			getDictList() {
 				//获取字典列表, 添加并全局变量保存
@@ -148,10 +147,16 @@
 					.then(res => {
 						//  console.log('88888', res.data.data)
 						uni.setStorageSync('getDictDataList', res.data.data);
-
 					})
 			},
-
+			getuserInfo() {
+				//获取用户信息
+				this.$api.get('/user/userInfo', {})
+					.then(res => {
+						  console.log('88888', res.data.data)
+						uni.setStorageSync('getuserInfo', res.data.data);
+					})
+			},
 
 			// 密码显示/密码隐藏
 			showOrHide() {

+ 2 - 0
pages/my/my.vue

@@ -49,6 +49,8 @@
 				</u-grid-item>
 			</u-grid>
 		</view>
+		
+		
 		<!-- 导航栏结束 -->
 		<view class="middleimgs">
 			<!-- <img src="@/static/my/xinxi.png" alt=""> -->

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 4 - 4
unpackage/cache/wgt/__UNI__FF40C0C/app-service.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
unpackage/cache/wgt/__UNI__FF40C0C/app-view.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
unpackage/cache/wgt/__UNI__FF40C0C/manifest.json


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 4 - 4
unpackage/dist/build/app-plus/app-service.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
unpackage/dist/build/app-plus/app-view.js