pages/index/details.vue

@@ -454,6 +454,7 @@ export default {
 					});
 				} else {
 					this.info = res.data;
+                    this.cur = res.data.is_selfraising;
 				}
 			});
 			this.$u.api.takeawayerlist({}).then(res => {

pages/index/mention.vue

@@ -5,7 +5,7 @@
                 <text>上传凭证</text>
                 <text class="tips">（仅可上传1张凭证）</text>
             </view>
-            <u-upload class="upload-box" :form-data="coverformdata" :action="action" :header="header" name="common" :max-count="1" @on-success="uploadSuc"></u-upload>
+            <u-upload class="upload-box" :form-data="coverformdata" upload-text="" :action="action" :header="header" name="common" :max-count="1" @on-success="uploadSuc"></u-upload>
         </view>
         <view class="remarks">
             <view>备注:</view>
@@ -43,7 +43,7 @@
                         title: e.message,
                         type: "success"
                     })
-                    console.log(e.data);
+                    // console.log(e.data);
                     this.img_url = e.data.file_path;
                 } else {
                     this.$refs.uToast.show({
@@ -79,6 +79,7 @@
                         this.$refs.uToast.show({
                             title: res.message,
                             type: "success",
+                            isTab: "true",
                             url: "/pages/index/index"
                         })
                     } else {
@@ -97,6 +98,9 @@
 .container {
     padding: 30rpx;
 }
+::v-deep.uicon-plus {
+    font-size: 50rpx !important;
+}
 .upload {
     .title {
         display: flex;
@@ -130,10 +134,13 @@
 }
 .btn-submit {
     width: 690rpx;
-    height: 98rpx;
+    height: 98rpx !important;
     margin-top: 70rpx;
-    color: #fff;
+    font-size: 36rpx !important;
+    text-align: center;
+    line-height: 98rpx !important;
+    color: #fff !important;
     border-radius: 50rpx;
-    background-color: #FF780F;
+    background-color: #FF780F !important;
 }
 </style>

pages/login/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- login页面 -->
 	<view>
-		<view class="login">
+		<view class="login" @touchmove.stop.prevent="moveHandle">
 			<!-- <image class="images" :src="url"></image> -->
 			<view class="backes"></view>
 			<view class="title_top">德铭阳光在线-商家端</view>
@@ -13,6 +13,9 @@
 					<view v-bind:class="[state==1 ? 'show' : '']" @click="changetab(1)">
 						达人登录
 					</view>
+                    <view v-bind:class="[state==2 ? 'show' : '']" @click="changetab(2)">
+                    	平台达人登录
+                    </view>
 				</view>
 				<view class="" v-if="state==0">
 					<view class="labales">
@@ -24,7 +27,7 @@
 						<input v-model="mima" type="password" placeholder="请输入密码" />
 					</view>
 				</view>
-				<view class="" v-else>
+				<view class="" v-else-if="state==1">
 					<view class="labales">
 						<image src="../../static/image/login/login(3).png"></image>
 						<input v-model="zhanghaoA" type="text" placeholder="请输入账号" />
@@ -34,10 +37,20 @@
 						<input v-model="mimaA" type="password" placeholder="请输入密码" />
 					</view>
 				</view>
-
+                <view v-else>
+                    <view class="labales">
+                    	<image src="../../static/image/login/login(3).png"></image>
+                    	<input v-model="phone" type="number" maxlength="11" placeholder="请输入手机号" />
+                    </view>
+                    <view class="labales">
+                    	<image src="../../static/image/login/safe.png"></image>
+                    	<input v-model="code" type="number" placeholder="请输入验证码" />
+                        <u-button class="get-code">获取验证码</u-button>
+                    </view>
+                </view>
 			</view>
 			<!-- denglu QQ weixin -->
-			<button @click="logins">{{ login }}</button> 
+			<button @click="logins">{{ login }}</button>
 			<!-- <u-button :custom-style="customStyle" ></u-button> -->
 			<u-toast ref="uToast" />
 		</view>
@@ -61,6 +74,8 @@ export default {
 			zhanghaoA: '',
 			mimaA: '',
 			url: '',
+            phone: "",
+            code: "",
 			state:0,
 			clickstate:false
 		};
@@ -89,7 +104,7 @@ export default {
 		loading() {},
 		logins() {
 			// 判断是否可以点击
-            console.log(this.zhanghao);
+            // console.log(this.zhanghao);
 			if(this.clickstate==false){
 				this.clickstate=true
 			}else{
@@ -143,8 +158,10 @@ export default {
 					}
 				});
 			}
-
+		},
-		}
+        moveHandle(){
+            return;
+        }
 	},
 	onLoad() {
 		let token = uni.getStorageSync('token');
@@ -171,6 +188,7 @@ export default {
 	top: 0;
 	left: 0;
 	z-index: -1;/*-1 可以当背景*/
+    transform: scale(1.1);
 	-webkit-filter: blur(3px);
 	filter: blur(3px);
 }
@@ -247,27 +265,38 @@ export default {
 	.labales text {
 		font-size: 30rpx;
 	}
+    
+    .get-code {
+        width: 250rpx !important;
+        height: 60rpx !important;
+        font-size: 30rpx !important;
+        line-height: 60rpx !important;
+        color: #fff !important;
+        border: none !important;
+        border-radius: 10rpx !important;
+        &::after {
+            border: none !important;
+        }
+    }
 
 	.labales {
+        display: flex;
+        align-items: center;
+		height: 90rpx;
+		margin-bottom: 160rpx;
+		line-height: 90rpx;
 		border-bottom: 1px #fff solid;
-		margin-bottom: 180rpx;
-		height: 70rpx;
-		line-height: 70rpx;
-		position: relative;
 		input {
 			width: 80%;
-			margin-left: 60rpx;
+			margin-left: 30rpx;
 			color: #fff;
 			letter-spacing: 2rpx;
 			background-color: none;
 		}
 	}
 	.labales image {
-		position: absolute;
+        flex-shrink: 0;
-		left: 0;
+		width: 38rpx;
-		top: 0;
-		bottom: 0;
-		width: 39rpx;
 		height: 40rpx;
 	}
 	.labales:nth-child(3) {