From 995fa6769ccc6d09126f0ca3ddc4f329d403e7db Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Tue, 30 Jan 2024 17:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                 |  8 ++++++++
 pages/my/my.vue            |  9 +++------
 pages/scan/scan.vue        | 32 +++++++++++++-------------------
 subpkg/address/address.vue | 18 ++++++++++++++++--
 subpkg/list/list.vue       |  9 ++++++++-
 subpkg/medal/medal.vue     |  8 ++++++--
 6 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/pages.json b/pages.json
index e23f2ac..5ce82d1 100644
--- a/pages.json
+++ b/pages.json
@@ -94,6 +94,14 @@
 				"navigationBarTitleText" : "",
 				"enablePullDownRefresh" : true
 			}
+		},
+		{
+			"path" : "role/role",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false
+			}
 		}]
 	}],
 	"globalStyle": {
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 3509aa1..d7e04fa 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -52,10 +52,7 @@
 
 <script>
 	import tabbar from "@/components/tabbar/tabbar.vue";
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
+	import {mapState,mapMutations} from 'vuex'
 	export default {
 		data() {
 			return {
@@ -80,7 +77,7 @@
 			this.page = "my"
 		},
 		computed: {
-			...mapState('m_user', ['userinfo'])
+			...mapState('m_user', ['userinfo','userId'])
 		},
 		methods: {
 			...mapMutations('m_user', ['updateAddress', 'updateUserInfo', 'updateToken']),
@@ -100,7 +97,7 @@
 				
 				const {
 					data: res
-				} = await uni.$http.post('/small/wechat/showMyMedal',{openId:"cpqKnCOSsO+0mWqJI/T1MQ=="})
+				} = await uni.$http.post('/small/wechat/showMyMedal',{guid:this.userId})
 				if (!res.success) return uni.$showMsg()
 				this.medalNum = res.data.length;
 				
diff --git a/pages/scan/scan.vue b/pages/scan/scan.vue
index 9000a82..2d32d7f 100644
--- a/pages/scan/scan.vue
+++ b/pages/scan/scan.vue
@@ -1,45 +1,39 @@
 <template>
 	<view>
-		<view class="video-wrapper" id="video-container">
-		</view>
-		<sVideo jsonId="6215c8757e8947c8aae0fd0b3d2d503b"></sVideo>
-
 		<tabbar :page="page"></tabbar>
 	</view>
 </template>
 
 <script>
-	import tabbar from "@/components/tabbar/tabbar.vue";
-	import sVideo from "@/components/s-video/s-video.vue";
+    import tabbar from "@/components/tabbar/tabbar.vue";
 	export default {
 
 		data() {
 			return {
-				page: "",
+				page: ""
 			};
 		},
 		onReady() {
 			this.QR();
 		},
 		onShow() {
-			this.page = "scan"
+		  this.page= "scan"
 		},
 		methods: {
 			QR() {
-				// uni.scanCode({
-				// 	onlyFromCamera: true,
-				// 	success: (res) => {
-				// 		console.log('扫描二维码成功,结果:' + res.result);
-				// 	},
-				// 	error: (res) => {
-				// 		console.log('扫描二维码出现错误')
-				// 	}
-				// })
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: (res) => {
+						console.log('扫描二维码成功,结果:' + res.result);
+					},
+					error: (res) => {
+						console.log('扫描二维码出现错误')
+					}
+				})
 			},
 		},
 		components: {
-			tabbar,
-			sVideo
+			tabbar
 		}
 	}
 </script>
diff --git a/subpkg/address/address.vue b/subpkg/address/address.vue
index 44c7f1b..0016a3e 100644
--- a/subpkg/address/address.vue
+++ b/subpkg/address/address.vue
@@ -13,7 +13,7 @@
 	<view>
 		<uni-swipe-action>
 		  <block v-for="(item, i) in addressList" :key="i">
-		    <uni-swipe-action-item :options="options" @click="swipeItemClickHandler(item)">
+		    <uni-swipe-action-item :right-options="options" @click="swipeItemClickHandler(item)">
                <view class="address-info-box">
 		     	 <view class="row1">
 		     		<view class="row1-left">
@@ -55,10 +55,17 @@
 
 <script>
   import { mapState, mapMutations, mapGetters } from 'vuex'
+  import addressVue from './address.vue';
 
   export default {
     data() {
       return {
+		  options: [{
+		    text: '删除',
+		    style: {
+		      backgroundColor: '#C00000'
+		    }
+		  }],
 		addressList:[]
       };
     },
@@ -118,7 +125,14 @@
             if (settingResult.authSetting['scope.address']) return uni.$showMsg('授权成功！请选择地址')
           }
         })
-      }
+      },
+	  async swipeItemClickHandler(item){
+		  this.addressList = this.addressList.filter(x=>x.guid!=item.guid);
+		  const {
+		  	data: res
+		  } = await uni.$http.post('/small/project/address/remove',item.guid)
+		  if (!res.success) return uni.$showMsg()
+	  }
     },
     computed: {
       ...mapState('m_user', ['address','userId']),
diff --git a/subpkg/list/list.vue b/subpkg/list/list.vue
index 0e1ee8e..5c353be 100644
--- a/subpkg/list/list.vue
+++ b/subpkg/list/list.vue
@@ -21,7 +21,7 @@
 		</view>
 		<!-- 场景区域 -->
 		<view class="nav-list">
-		  <view class="nav-item" v-for="(item, i) in sceneList" :key="i">
+		  <view class="nav-item" v-for="(item, i) in sceneList" :key="i" @click="navClickHandler(item)">
 		    <image :src="item" class="nav-img"></image>
 		  </view>
 		</view>
@@ -80,6 +80,13 @@
 				}
 				return arr.join('&')
 			},
+			navClickHandler(item) {
+				if(item !== ""){
+					uni.navigateTo({
+					   url:'/subpkg/role/role'
+					})
+				}
+			},
 			input(e){
 				clearTimeout(this.timer)
 				
diff --git a/subpkg/medal/medal.vue b/subpkg/medal/medal.vue
index 12bad04..da5b8aa 100644
--- a/subpkg/medal/medal.vue
+++ b/subpkg/medal/medal.vue
@@ -31,6 +31,7 @@
 </template>
 
 <script>
+	import { mapState, mapMutations, mapGetters } from 'vuex'
 	export default {
 		data() {
 			return {
@@ -41,6 +42,9 @@
 				myMedalList: [],
 			};
 		},
+		computed: {
+			...mapState('m_user', ['userId'])
+		},
 		onLoad() {
 				this.getMedalList();
 				this.getMyMedalList()
@@ -62,10 +66,10 @@
 					uni.$showMsg('数据请求成功！')
 				},
 				async getMyMedalList() {
-					
+				
 					const {
 						data: res
-					} = await uni.$http.post('/small/wechat/showMyMedal',{openId:"cpqKnCOSsO+0mWqJI/T1MQ=="})
+					} = await uni.$http.post('/small/wechat/showMyMedal',{guid:this.userId})
 					if (!res.success) return uni.$showMsg()
 					
 					res.data.forEach(item=>{