修改弹窗

components/elm-toast/index.vue

@@ -6,11 +6,11 @@
 				<view class="divss">
 					<view class="namne">{{tips}}</view>
 					<view class="namnes">{{ msg!=null&&msg!=''?msg:"网络异常" }}</view>
-          <view style="display: flex; justify-content: center;">
+          <view v-if="isCancel==true" style="display: flex; justify-content: center;">
             <view class="cancelButton" @click="cancel()">取消</view>
             <view class="confirmButton" @click="hideDialog()">确定</view>
           </view>
-
+          <view v-else class="button" @click="hideDialog()">确定</view>
 				</view>
 			</view>
 		</view>
@@ -28,6 +28,10 @@
 				type: String,
 				default: "提示"
 			},
+      isCancel: {
+        type: Boolean,
+        default: true
+      },
 			isConfirm: {
 				type: Boolean,
 				default: false
@@ -165,6 +169,21 @@
             margin-top: 64rpx;
           }
 
+          .button {
+            width: 392rpx;
+            height: 84rpx;
+            background: linear-gradient(86deg, #c2d2f9 0%, #c5c2f3 100%);
+            border-radius: 42rpx;
+
+            font-size: 28rpx;
+            font-family: 'PingFang SC-Regular, PingFang SC';
+            font-weight: 400;
+            color: #415c9e;
+            line-height: 84rpx;
+            text-align: center;
+            margin: 0 auto;
+            margin-top: 64rpx;
+          }
 					.namnes {
 						width: 364rpx;
 						height: 96rpx;

pagesUser/addMessage.vue

@@ -7,7 +7,7 @@
 		<view class="adding" @click="saveAbout">
 			发送
 		</view>
-		<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM>
+		<ELM ref="elm" :msg="tipMsg" :isCancel="false" :isConfirm="isConfirm" @confirm="confirm"></ELM>
     <ELM ref="elmMessage" :msg="tipMsg" :isConfirm="isMessageConfirm" @confirm="messageConfirm"></ELM>
     <ELM ref="elmPay" :msg="tipMsg" :isConfirm="isPayConfirm" @confirm="payConfirm"></ELM>
 	</view>

pagesUser/userInfo.vue

@@ -199,7 +199,7 @@
 			<image v-show="showArrowDown" :src="baseUrl+'/user/arrow_down_sm.png'" mode="aspectFill" class="fixed_down"/>
 		</view>
 
-    <ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM>
+    <ELM ref="elm" :msg="tipMsg" :isCancel="false" :isConfirm="isConfirm" @confirm="confirm"></ELM>
     <ELM ref="elmCoin" :msg="tipMsg" :isConfirm="isCoinConfirm" @confirm="coinConfirm"></ELM>
     <ELM ref="elmLike" :msg="tipMsg" :isConfirm="isLikeConfirm" @confirm="likeConfirm"></ELM>
 	</view>
@@ -496,9 +496,10 @@
               this.showAnima = false;
             }, 500)
           } else {
-            this.tipMsg = res.data.message;
-            this.isCoinConfirm = true;
-            this.$refs.elmCoin.showDialog();
+            uni.showToast({
+              title: res.data.message,
+              icon: 'none'
+            })
           }
         })
       },

pagesme/me/editAbout.vue

@@ -7,7 +7,7 @@
 		<view class="adding" @click="saveAbout">
 			保存
 		</view>
-		<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM>
+		<ELM ref="elm"  :isCancel="false" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM>
 	</view>
 </template>
 <script>

pagesme/message/info.vue

@@ -67,13 +67,12 @@
       </view>
     </u-popup>
 
-    <ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM>
-    <ELM ref="elmShowApply" :msg='tipMsg' :isConfirm="showApply" @confirm="apply" @cancel="refuse"></ELM>
+    <ELM ref="elm" :msg="tipMsg" :isCancel="false" :isConfirm="isConfirm" @confirm="confirm"></ELM>
+    <ELM ref="elmShowApply" :msg='tipMsg' :isConfirm="showApply" @confirm="acceptPayConfirm" @cancel="refuse"></ELM>
     <ELM ref="elmMessage" :msg="tipMsg" :isConfirm="isMessageConfirm" @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="elmAcceptPay" :msg='tipMsg' :isConfirm="isAcceptPayConfirm" @confirm="acceptPayConfirm"></ELM>
     <ELM ref="elmRefuse" :msg='tipMsg' :isConfirm="isRefuseConfirm" @confirm="refuseConfirm"></ELM>
   </view>
 </template>
@@ -113,7 +112,6 @@ export default {
       isBlackConfirm: false,
       isMessagePayConfirm: false,
       isApplyPayConfirm: false,
-      isAcceptPayConfirm: false,
       isRefuseConfirm: false,
       applyWxPayment:0,
       acceptWxPayment:0,
@@ -321,11 +319,6 @@ export default {
     },
     openApply(){
       this.showApply = true
-      this.tipMsg = '是否接受对方的请求'
-      this.$refs.elmShowApply.showDialog();
-    },
-    apply(){
-      this.isAcceptPayConfirm = true
       this.tipMsg = '是否花费'+ this.acceptWxPayment +'金币，向对方发起请求';
       this.$refs.elmAcceptPay.showDialog();
     },