Merge remote-tracking branch 'origin/master'

components/elm-toast/index.vue

@@ -3,14 +3,15 @@
 		<view class="bg"></view>
 		<view class="dialog_content">
 			<view class="bag">
+        <image class="pop-bgc" :src="img + '/common/home-pop-bg.png'"></image>
 				<view class="divss">
 					<view class="namne">{{tips}}</view>
 					<view class="namnes">{{ msg!=null&&msg!=''?msg:"网络异常" }}</view>
           <view v-if="isCancel==true" style="display: flex; justify-content: center;">
-            <view class="cancelButton" @click="cancel()">取消</view>
-            <view class="confirmButton" @click="hideDialog()">确定</view>
+            <view class="cancelButton" @click="cancel()">{{cancelName}}</view>
+            <view class="confirmButton" @click="hideDialog()">{{confirmName}}</view>
           </view>
-          <view v-else class="button" @click="hideDialog()">确定</view>
+          <view v-else class="button" @click="hideDialog()">{{confirmName}}</view>
 				</view>
 			</view>
 		</view>
@@ -28,6 +29,14 @@
 				type: String,
 				default: "提示"
 			},
+      cancelName: {
+        type: String,
+        default: "取消"
+      },
+      confirmName: {
+        type: String,
+        default: "确定"
+      },
       isCancel: {
         type: Boolean,
         default: true
@@ -39,7 +48,7 @@
 		},
 		data() {
 			return {
-				img: this.$BASE_URL,
+				img: this.$IMG_URL,
 				show: false
 			};
 		},
@@ -133,7 +142,7 @@
 						width: 100%;
 						height: 56rpx;
 						line-height: 56rpx;
-						margin-top: 156rpx;
+						margin-top: 66rpx;
 						text-align: center;
 					}
 
@@ -150,7 +159,7 @@
 						line-height: 84rpx;
 						text-align: center;
 						margin: 0 auto;
-						margin-top: 64rpx;
+						margin-top: 100rpx;
 					}
 
           .cancelButton {
@@ -166,7 +175,7 @@
             line-height: 84rpx;
             text-align: center;
             margin: 0 auto;
-            margin-top: 64rpx;
+            margin-top: 100rpx;
           }
 
           .button {
@@ -182,7 +191,7 @@
             line-height: 84rpx;
             text-align: center;
             margin: 0 auto;
-            margin-top: 64rpx;
+            margin-top: 100rpx;
           }
 					.namnes {
 						width: 364rpx;
@@ -193,7 +202,7 @@
 						color: #4a4a4a;
 						line-height: 48rpx;
 						margin: 0 auto;
-						margin-top: 40rpx;
+						margin-top: 80rpx;
 						text-align: center;
 					}
 				}

pages/tab/index.vue

@@ -64,7 +64,7 @@
 				</view>
 			</view>
 		</view>
-    <ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM>
+    <ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" confirmName="认证" @confirm="confirm"></ELM>
 	</view>
 </template>
 
@@ -197,8 +197,12 @@
           uni.showToast({
             title: '请先登录',
             icon: 'none',
-            duration: 1000
           })
+          setTimeout(() => {
+            uni.switchTab({
+              url: '/pages/tab/my'
+            });
+          }, 500)
         } else {
           isStopAccount().then(res => {
             //如果flag=0 被禁用了 踢出该用户

pagesArticle/publishArticle.vue

@@ -86,7 +86,7 @@
           if (res.data.code == 200){
             uni.showToast({
               title: '发表成功',
-              icon: 'success'
+              icon: 'none'
             })
             uni.setStorageSync("isRefresh", true)
             setTimeout(() => {

pagesUser/addMessage.vue

@@ -63,9 +63,13 @@
           }
           addMessage(data).then(res => {
             if (res.data.code == 200) {
-              this.isConfirm = true;
-              this.tipMsg = "发送成功";
-              this.$refs.elm.showDialog();
+              uni.showToast({
+                title: '发送成功',
+                icon: 'none'
+              })
+              setTimeout(() => {
+                this.backbar()
+              }, 500)
             } else if (res.data.code === 1001){
               //留言超出限制 是否采用金币进行留言
               this.isPayConfirm = true;
@@ -105,9 +109,13 @@
         }
         addMessage(form).then(res=>{
           if (res.data.code == 200){
-            this.isConfirm = true;
-            this.tipMsg = "发送成功";
-            this.$refs.elm.showDialog();
+            uni.showToast({
+              title: '发送成功',
+              icon: 'none'
+            })
+            setTimeout(() => {
+              this.backbar()
+            }, 500)
           } else if (res.data.code === 1001){
             uni.showToast({
               title: res.data.message,
@@ -126,6 +134,11 @@
           url: "/pagesme/goldCoin/recharge"
         })
       },
+      backbar(){
+        uni.navigateBack({
+          delta: 1
+        })
+      }
 		}
 	}
 </script>

pagesUser/userInfo.vue

@@ -197,7 +197,7 @@
 		</view>
 
     <ELM ref="elm" :msg="tipMsg" :isCancel="false" :isConfirm="isConfirm" @confirm="confirm"></ELM>
-    <ELM ref="elmCoin" :msg="tipMsg" :isConfirm="isCoinConfirm" @confirm="coinConfirm"></ELM>
+    <ELM ref="elmCoin" :msg="tipMsg" :isConfirm="isCoinConfirm" confirmName="充值" @confirm="coinConfirm"></ELM>
     <ELM ref="elmLike" :msg="tipMsg" :isConfirm="isLikeConfirm" @confirm="likeConfirm"></ELM>
 	</view>
 </template>
@@ -496,6 +496,10 @@
             setTimeout(() => {
               this.showAnima = false;
             }, 500)
+          } else if (res.data.code == 1003) {
+            this.isCoinConfirm = true;
+            this.tipMsg = res.data.message;
+            this.$refs.elmCoin.showDialog();
           } else {
             uni.showToast({
               title: res.data.message,

pagesme/me/doubleauth.vue

@@ -3,7 +3,7 @@
 		<view class="auth-item">
 			<image class="auth-img" :src="baseUrl+'/user/sfauth.png'"></image>
 			<view class="auth-con">
-				<view class="auth-con-1">身份认证</view>
+				<view class="auth-con-1">实名认证</view>
         <view class="auth-con-2" style="color: #4093fa" v-if="userInfo.memRealAuthen=='1'">已认证</view>
 				<view class="auth-con-2" v-else>未认证</view>
 			</view>

pagesme/me/updateInformation.vue

@@ -314,9 +314,10 @@ import {getOssUrl} from "../../api/article";
 					count: 1,
 					success: (res) => {
 						res.tempFilePaths.forEach((i) => {
-							uni.showLoading({
-								title: "图片上传中"
-							})
+              uni.showToast({
+                title: '图片上传中',
+                icon: 'none',
+              })
               uni.uploadFile({
                 url: this.$BASE_URL + '/common/fileUpload',
                 filePath: i,
@@ -373,13 +374,13 @@ import {getOssUrl} from "../../api/article";
           if (res.data.code == 200) {
             uni.showToast({
               title: '操作成功',
-              icon: 'success',
+              icon: 'none',
             })
             this.getUserInfo()
           }else {
             uni.showToast({
               title: '操作失败',
-              icon: 'error',
+              icon: 'none',
             })
             this.getUserInfo()
           }

pagesme/message/info.vue

@@ -68,8 +68,8 @@
     </u-popup>
 
     <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="elmShowApply" :msg='tipMsg' :isConfirm="showApply" cancelName="拒绝" confirmName="接受" @confirm="acceptPayConfirm" @cancel="refuse"></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>
@@ -467,7 +467,7 @@ export default {
     },
     phoneClick(){
       uni.showToast({
-        title: '功能待开发',
+        title: '功能开发中',
         icon: 'none'
       })
     },