修改bug

components/elm-toast/index.vue

@@ -3,6 +3,7 @@
 		<view class="bg"></view>
 		<view class="dialog_content">
 			<view class="bag">
+        <view v-if="isClose==true" class="close-button" @click="close()">×</view>
         <image class="pop-bgc" :src="img + '/common/home-pop-bg.png'"></image>
 				<view class="divss">
 					<view class="namne">{{tips}}</view>
@@ -44,7 +45,11 @@
 			isConfirm: {
 				type: Boolean,
 				default: false
-			}
+			},
+      isClose: {
+        type: Boolean,
+        default: false
+      }
 		},
 		data() {
 			return {
@@ -72,6 +77,9 @@
         if (this.isConfirm != undefined&&this.isConfirm!=null && this.isConfirm == true) {
           this.$emit('cancel')
         }
+      },
+      close(){
+        this.show = false;
       },
 			gzh() {
 				this.show = false;
@@ -127,6 +135,26 @@
 				margin-left: 125rpx;
 				margin-top: 40%;
 
+        // 关闭按钮样式
+        .close-button {
+          position: absolute;
+          top: 20rpx;
+          right: 20rpx;
+          width: 40rpx;
+          height: 40rpx;
+          line-height: 40rpx;
+          text-align: center;
+          font-size: 40rpx;
+          font-weight: bold;
+          color: #999999;
+          cursor: pointer;
+          z-index: 10;
+
+          &:active {
+            color: #666666; // 点击时颜色变化
+          }
+        }
+
 				.divss {
 					position: absolute;
 					top: 0;

pages/tab/my.vue

@@ -169,9 +169,9 @@
           <view class="pop-title">温馨提示</view>
           <view class="tips-content">
             请您仔细阅读并充分理解相关条款， 点击同意即代表您已阅读并同意
-            <view class="agreement-btn">《用户协议》</view>
+            <view class="agreement-btn" @click="gotoPage('0')">《用户协议》</view>
             、
-            <view class="agreement-btn">《隐私政策》</view>
+            <view class="agreement-btn" @click="gotoPage('1')">《隐私政策》</view>
           </view>
           <view class="btn-c">
             <view class="pop-btn agree" @click="handAgree">同意</view>
@@ -620,6 +620,17 @@ import {articleList, getOssUrl, userArticleList} from "../../api/article";
           url: "/pageslogin/index"
         })
 			},
+      gotoPage(index){
+        if (index == 0){
+          uni.navigateTo({
+            url: "/pagesme/set/agreement"
+          })
+        } else if (index == 1){
+          uni.navigateTo({
+            url: "/pagesme/set/privacy"
+          })
+        }
+      },
       //完善信息
 			updateInformation() {
 				uni.navigateTo({

pagesme/message/info.vue

@@ -29,7 +29,7 @@
                 <view class="chat-inner-layout">
                   <view class="chat-item-name">{{item.memNickName}}</view>
                   <view class="chat-item-msg-layout">
-                    <image class="chat-item-photo" :src="item.avatar" ></image>
+                    <image class="chat-item-photo" :src="item.avatarUrl" ></image>
                     <view class="chat-inner-msg-left">{{item.content}}</view>
                   </view>
                 </view>
@@ -68,12 +68,11 @@
     </u-popup>
 
     <ELM ref="elm" :msg="tipMsg" :isCancel="false" :isConfirm="isConfirm" @confirm="confirm"></ELM>
-    <ELM ref="elmShowApply" :msg='tipMsg' :isConfirm="showApply" cancelName="拒绝" confirmName="接受" @confirm="acceptPayConfirm" @cancel="refuse"></ELM>
+    <ELM ref="elmShowApply" :msg='tipMsg' :isConfirm="showApply" :isClose="true" cancelName="拒绝" confirmName="接受" @confirm="acceptPayConfirm" @cancel="refuseConfirm"></ELM>
     <ELM ref="elmMessage" :msg="tipMsg" :isConfirm="isMessageConfirm" confirmName="充值" @confirm="messageConfirm"></ELM>
     <ELM ref="elmBlack" :msg='tipMsg' :isConfirm="isBlackConfirm" @confirm="blackConfirm"></ELM>
     <ELM ref="elmMessagePay" :msg='tipMsg' :isConfirm="isMessagePayConfirm" @confirm="messagePayConfirm"></ELM>
     <ELM ref="elmApplyPay" :msg='tipMsg' :isConfirm="isApplyPayConfirm" @confirm="applyPayConfirm"></ELM>
-    <ELM ref="elmRefuse" :msg='tipMsg' :isConfirm="isRefuseConfirm" @confirm="refuseConfirm"></ELM>
   </view>
 </template>
 
@@ -112,7 +111,6 @@ export default {
       isBlackConfirm: false,
       isMessagePayConfirm: false,
       isApplyPayConfirm: false,
-      isRefuseConfirm: false,
       applyWxPayment:0,
       acceptWxPayment:0,
       wxTask:[]
@@ -321,11 +319,6 @@ export default {
       this.tipMsg = '是否花费'+ this.acceptWxPayment +'金币，接受对方请求';
       this.$refs.elmShowApply.showDialog();
     },
-    refuse(){
-      this.isRefuseConfirm = true
-      this.tipMsg = '是否确认拒绝对方请求';
-      this.$refs.elmRefuse.showDialog();
-    },
     getWxTask(){
       const form = {
         targetId: this.targetId,