feat: bug修复;

components/config/PrivacyAgreementPoup.vue

@@ -1,169 +0,0 @@
-<template>
-	<uv-popup ref="popup" z-index="99999" :closeOnClickOverlay="false" :customStyle="{ backgroundColor: 'transparent' }">
-		<view class="privacyPopup">
-			<view class="icon">
-				<image src="/static/image/PrivacyAgreementPoup/icon.png" 
-				mode=""></image>
-			</view>
-			<view class="title">
-				<view>协议与隐私政策</view>
-			</view>
-			<view class="content_pri">
-				<view class="text">
-					欢迎来到酒店布草!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。
-				</view>
-			</view>
-			<view class="config">
-				<uv-checkbox-group v-model="checkboxValue" shape="circle">
-					<view class="content">
-						<view style="display: flex;">
-							<!-- <uv-checkbox size="30rpx" :name="1"></uv-checkbox> -->
-							同意<text @click="goToPrivacy">《酒店布草隐私政策》</text>
-						</view>
-						<view class="">
-							以及<text @click="goToPrivacy">《用户协议》</text>
-						</view>
-					</view>
-				</uv-checkbox-group>
-			</view>
-			<view class="pri_btn">
-				<button class="confuse_btn" @click="confusePrivacy">拒绝</button>
-				<button 
-				class="confirm_btn" id="agree-btn" 
-				open-type="agreePrivacyAuthorization"
-				@agreeprivacyauthorization="handleAgreePrivacyAuthorization">同意</button>
-			</view>
-		</view>
-	</uv-popup>
-</template>
-
-<script>
-	export default {
-		name: 'PrivacyAgreementPoup',
-		data() {
-			return {
-				resolvePrivacyAuthorization: {},
-				checkboxValue : false
-			}
-		},
-		mounted() {
-			if(wx.getPrivacySetting){
-				wx.getPrivacySetting({
-					success: res => {
-						console.log(res)
-						if (res.needAuthorization) {
-							// 需要弹出隐私协议
-							this.init()
-						}
-					},
-					fail: () => {}
-				})
-			}
-		},
-		methods: {
-
-			//初始化
-			init(resolve) {
-				this.$refs.popup.open('center')
-				this.resolvePrivacyAuthorization = resolve
-			},
-
-			// 打开隐私协议
-			goToPrivacy() {
-				wx.openPrivacyContract({
-					success: () => {
-						console.log('打开成功');
-					}, // 打开成功
-					fail: () => {
-						uni.showToast({
-							title: '打开失败，稍后重试',
-							icon: 'none'
-						})
-					} // 打开失败
-				})
-			},
-
-			// 拒绝
-			confusePrivacy() {
-				this.$refs.popup.close()
-				// this.resolvePrivacyAuthorization({
-				// 	event: 'disagree'
-				// })
-			},
-
-			// 同意
-			handleAgreePrivacyAuthorization() {
-				// 告知平台用户已经同意，参数传同意按钮的id
-				// this.resolvePrivacyAuthorization({
-				// 	buttonId: 'agree-btn',
-				// 	event: 'agree'
-				// })
-				this.$refs.popup.close()
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.privacyPopup {
-		width: 90%;
-		margin: 0rpx auto;
-		background: white;
-		border-radius: 20rpx;
-		box-sizing: border-box;
-		padding: 40rpx 30rpx;
-		
-		.icon{
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			padding-bottom: 30rpx;
-			image{
-				width: 90rpx;
-				height: 90rpx;
-			}
-		}
-
-		.title {
-			text-align: center;
-			font-size: 36rpx;
-		}
-
-		.content_pri {
-			padding: 30rpx 0rpx;
-			font-size: 28rpx;
-		}
-
-		.config {
-			font-size: 28rpx;
-			text-align: center;
-			line-height: 40rpx;
-			margin-bottom: 30rpx;
-
-			text {
-				color: $uni-color;
-			}
-			
-			.content{
-				display: flex;
-			}
-		}
-
-		.pri_btn {
-			display: flex;
-			.confuse_btn{
-				background-color: #F2F2F2;
-				color: #BDBDBD;
-			}
-			button {
-				margin: 10rpx;
-				flex: 1;
-				background: $uni-color;
-				outline: none;
-				color: white;
-				font-size: 30rpx;
-			}
-
-		}
-	}
-</style>

components/home/popupAuditMsg.vue

@@ -0,0 +1,94 @@
+<template>
+  <uv-popup 
+    ref="popup"
+    :overlayOpacity="0.8"
+    :customStyle="{
+      backgroundColor: 'transparent',
+    }"
+  >
+    <view class="popup">
+      <image class="popup-bg" src="@/static/image/home/bg-audit-pass.png"></image>
+      <view class="popup-content flex">
+        <text class="value">{{ count }}</text>
+        <image class="unit" src="@/static/image/home/text-share.png"></image>
+      </view>
+      <view class="flex popup-btns">
+        <button plain class="btn-simple" @click="close">
+          <image class="popup-btn" src="@/static/image/home/cancel.png"></image>
+        </button>
+        <button plain class="btn-simple" @click="go">
+          <image class="popup-btn" src="@/static/image/home/go.png"></image>
+        </button>
+      </view>
+    </view>
+  </uv-popup>
+</template>
+
+<script>
+	export default {
+    props: {
+      count: {
+        type: Number,
+        default: 15
+      }
+    },
+		data() {
+			return {
+      }
+    },
+    methods: {
+      open() {
+        this.$refs.popup.open();
+      },
+      close() {
+        this.$refs.popup.close();
+      },
+      go() {
+				uni.navigateTo({
+					url: `/pages/index/record`
+				})
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+.popup {
+  position: relative;
+  width: 578rpx;
+
+  &-bg {
+    width: 578rpx; height: 317rpx;
+  }
+
+  &-content {
+    position: absolute;
+    top: 123rpx;
+    left: 50%;
+    transform: translateX(-50%);
+
+    .value {
+      color: #FF2323;
+      font-size: 102rpx;
+      font-weight: 700;
+      line-height: 125rpx;
+    }
+
+    .unit {
+      width: 299rpx;
+      height: 77rpx;
+      margin-left: 9rpx;
+    }
+  }
+
+  &-btns {
+    justify-content: space-between; 
+    margin-top: 56rpx;
+  }
+
+  &-btn {
+    width: 265rpx; 
+    height: 84rpx;
+  }
+}
+</style>

pages/index/index.vue

@@ -18,6 +18,8 @@
 				</button>
 			</view>
 		</view>
+
+		<popupAuditMsg ref="popupAuditMsgRef"></popupAuditMsg>
 		
 		<tabber select="home"/>
 
@@ -27,10 +29,12 @@
 <script>	
 	import { mapState } from 'vuex'
 	import tabber from '@/components/base/tabbar.vue'
+	import popupAuditMsg from '@/components/home/popupAuditMsg.vue'
 
 	export default {
 		components : {
 			tabber,
+			popupAuditMsg,
 		},
 		data() {
 			return {
@@ -52,15 +56,11 @@
 						path: '/pages_order/record/articleSharing'
 					},
 				],
-				bgUrl: null,
 			}
 		},
     computed: {
 			...mapState(['userInfo']),
 		},
-		onShow() {
-			this.fetchBg()
-		},
 		onLoad(option) {
       const { state, shareId } = option
 
@@ -86,14 +86,6 @@
 			}
 		},
 		methods: {
-      async fetchBg() {
-        try {
-					// todo: check
-          this.bgUrl = (await this.$fetch('getBanner'))?.[0]?.image
-        } catch (err) {
-          
-        }
-      },
 			onClick(url) {
 				if (!uni.getStorageSync('token')) {
 					uni.navigateTo({
@@ -125,7 +117,7 @@
 			grid-row-gap: 34rpx;
 			grid-template-columns: repeat(2, 1fr);
 			position: absolute;
-			bottom: 466rpx;
+			bottom: 360rpx;
 			width: 100%;
 			padding: 0 58rpx;
 			box-sizing: border-box;

pages_order/auth/wxLogin.vue

@@ -4,10 +4,10 @@
 
 		<view class="flex flex-column" style="justify-content: flex-start;">
 
-			<image class="logo" :src="userInfo.headImage" mode=""></image>
+			<image class="logo" :src="configList.logo_image" mode=""></image>
 
 			<view class="title">
-				{{ userInfo.nickName }}
+				{{ configList.logo_name }}
 			</view>
 
 			<view class="operation">

pages_order/auth/wxUserInfo.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="page flex flex-column">
 			
-		<image class="logo" :src="userInfo.headImage" mode=""></image>
+		<image class="logo" :src="configList.logo_image" mode=""></image>
 
 		<view class="title">
-			{{ userInfo.nickName }}
+			{{ configList.logo_name }}
 		</view>
 
 		<view class="desc">

pages_order/mine/wallet.vue

@@ -36,7 +36,7 @@
           <view class="detail-tools">
             <uv-calendars ref="calendars" @confirm="onSelectDate" />
             <button plain class="flex btn-calendar" @click="openCalendars">
-              <text>日期选择</text>
+              <text>{{ queryParams.time || '日期选择' }}</text>
               <image class="btn-calendar-arrow" src="../static/center/down.png"></image>
             </button>
           </view>

pages_order/record/groupSharing.vue

@@ -152,7 +152,7 @@
 					'headImage': {
 						type: 'string',
 						required: true,
-						message: '请选择群封面图',
+						message: '请选择群头像',
 					},
 					'headTitle': {
 						type: 'string',
@@ -192,6 +192,7 @@
       const { id } = option
 
       if (!id) {
+        this.form.headImage = this.configList.index_sign
         return
       }
 

pages_order/record/videoSharing.vue

@@ -46,7 +46,7 @@
                     :show-center-play-btn="false"
                   ></video>
                   <view v-else class="flex flex-column" style="width: 344rpx; height: 344rpx;">
-                    <uv-icon name="camera" color="#000000" size="129rpx"></uv-icon>
+                    <image src="../static/record/icon-camera.png" style="width: 130rpx; height: 105rpx;" ></image>
                     <text class="upload-video-text">上传视频</text>
                   </view>
                 </template>
@@ -317,6 +317,8 @@
   &-text {
     color: #1B1B1B;
     font-size: 32rpx;
+    font-weight: 700;
+    margin-top: 35rpx;
   }
 }
 

pages_order/sharing/group.vue

@@ -5,6 +5,7 @@
     <view class="content">
       <image class="avatar" :src="detail.headImage"></image>
       <text class="nick-name">{{ detail.headTitle || '' }}</text>
+      <text class="desc">{{ `群人数：${detail.memberNum || 0}` }}</text>
 
       <template v-if="isLocked">
         <button class="btn" type="success" @click="onAdd">加入</button>
@@ -161,6 +162,10 @@
   margin-top: 30rpx;
 }
 
+.desc {
+  margin-top: 30rpx;
+}
+
 .btn, .group-info {
   position: absolute;
 }