ソースを参照

首页ui还原度调整及其他bug修改

huangzhe 3 年 前
コミット
8fcfb20baf

+ 4 - 4
src/components/basic-component/app-layout/app-user-login/app-user-login.vue

xqd xqd xqd
@@ -2,7 +2,7 @@
     <view class="login-1 dir-left-nowrap main-center cross-center" :class="showLoginModal ? 'show' : ''">
         <view class="login-content">
             <!-- <image :src="'https://t17.9026.com/web/statics/image/index/auth-default.png'" class="login-img"></image> -->
-			<image :src="'../../../../static/image/index/auth-default.png'" class="login-img"></image>
+			<image :src="'https://t17.9026.com/web/statics/image/index/auth-default.png'" class="login-img"></image>
             <view>
                 <app-hotspot :hotspot="auth_page.hotspot_link">
                     <button class="login-btn" @click="link"></button>
@@ -31,7 +31,7 @@
                             scope="userInfo"
                             @click="getUserInfoClick"
                     >
-					<image style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" src="../../../../static/image/index/wxlogin.png" mode=""></image>立即登录
+					<image style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" src="https://t17.9026.com/web/statics/image/index/wxlogin.png" mode=""></image>立即登录
                     </button>
                     <button class="main-center cross-center hxj-login"  v-else
                             :open-type="openType"
@@ -40,12 +40,12 @@
                             @getuserinfo="getUserInfo"
                             @click="getUserInfoClick"
                     >
-					<image style="width: 40rpx;height: 40px;margin-right: 10rpx;" src="../../../../static/image/index/wxlogin.png" mode=""></image>立即登录
+					<image style="width: 40rpx;height: 40px;margin-right: 10rpx;" src="https://t17.9026.com/web/statics/image/index/wxlogin.png" mode=""></image>立即登录
                     </button>
                     <!-- #endif -->
                     <!-- #ifdef H5 -->
                     <view class="main-center cross-center hxj-login" @click="getUserInfo">
-						<image style="width: 40rpx;height: 40px;margin-right: 10rpx;" src="../../../../static/image/index/wxlogin.png" mode=""></image>立即登录
+						<image style="width: 40rpx;height: 40px;margin-right: 10rpx;" src="https://t17.9026.com/web/statics/image/index/wxlogin.png" mode=""></image>立即登录
 					</view>
                     <!-- #endif -->
                 </app-hotspot>

+ 79 - 77
src/components/page-component/app-user-center-top/app-user-center-top.vue

xqd xqd xqd xqd xqd
@@ -208,10 +208,19 @@
 						</view>
 						<!--#ifdef MP-WEIXIN -->
 							<image v-if="isRealname" style="width: 96rpx;height: 31rpx;margin-left: 14rpx;" src="https://t17.9026.com/web/statics/image/index/ysm.png" mode=""></image>
-						<button class="u-refresh dir-left-nowrap main-between cross-center "
-							open-type="getUserInfo" @getAuthorize="getUserInfo" @click="getUserInfo">
-							<icon class="u-icon" type></icon>
-							<text>刷新</text>
+						<button class="u-refresh dir-left-nowrap main-between cross-center " v-if="canIUseGetUserProfile"
+						open-type="getUserInfo"
+								@click="getUserInfoClick"
+								>
+						    <icon class="u-icon" type></icon>
+						    <text>刷新</text>
+						</button>
+						<button class="u-refresh dir-left-nowrap main-between cross-center " v-else open-type="getUserInfo"
+						        @getAuthorize="getUserInfo"
+						        @getuserinfo="getUserInfo"
+								>
+						    <icon class="u-icon" type></icon>
+						    <text>刷新</text>
 						</button>
 						<!-- #endif-->
 						<!--#ifdef  H5 -->
@@ -330,6 +339,9 @@
 					return 'https://shop.9026.com/web/statics/img/mall/static/user-default-avatar.png';
 				}
 			},
+			canIUseGetUserProfile() {
+				return this.$user.canIUseGetUserProfile();
+			},
 			getMemberPicUrl() {
 				return this.memberPicUrl;
 				// todo 此处选哪个图标待确认
@@ -368,77 +380,67 @@
 					url: '/pages/member/index/index',
 				});
 			},
+			getUserInfoClick(userInfoResult) {
+				console.log('userInfoResult',userInfoResult)
+				this.$user.getUserProfile(userInfoResult).then(e => {
+					this.getUserInfo(e);
+				}).catch(e => {
+					console.log(e)
+				})
+			},
 			getUserInfo(userInfoResult) {
-				// #ifdef MP
-
-				let _this = this;
-				wx.getUserProfile({
-					desc: "用于完善会员资料", // 声明获取用户个人信息后的用途,后续会展示在弹窗中,请谨慎填写
-					success: (res) => {
-						wx.getUserInfo({
-							success: (res2) => {
-								res2.rawData = res.rawData;
-								uni.login({
-									scopes: 'auth_user',
-									success(loginResult) {
-										const data = {
-											encryptedData: res2.encryptedData,
-											iv: res2.iv,
-											rawData: res2.rawData,
-											signature: res2.signature,
-											code: loginResult.code,
-										};
-										_this.$request({
-											url: _this.$api.passport.login,
-											method: 'post',
-											data: data
-										}).then(response => {
-											uni.hideLoading();
-											if (response.code === 0) {
-												uni.showToast({
-													title: '资料已更新',
-													icon: 'none'
-												});
-												_this.$storage.setStorageSync(
-													'_USER_ACCESS_TOKEN',
-													response.data.access_token);
-											} else {
-												return reject(response.msg);
-											}
-										});
-									}
-								});
-							},
-							fail: (res2) => {},
-						});
-
-					},
-					fail: (res) => {
-						console.log("fail", res);
-					},
-				});
-
-				// #endif
-				// #ifdef H5
-				this.$request({
-					url: this.$api.registered.url,
-					method: 'get',
-					data: {
-						scope: 'snsapi_userinfo',
-						response_type: 'code',
-						url: `${window.location.href}`
-					}
-				}).then(res => {
-					if (res.code === 0) {
-						this.$storage.setStorageSync('_USER_SIGN', true);
-						window.location.replace(res.data.url);
-					} else {
-						uni.navigateTo({
-							url: '/pages/registered/sign'
-						});
-					}
-				});
-				// #endif
+			    // #ifdef MP
+			    let _this = this;
+			    uni.login({
+			        scopes: 'auth_user',
+			        success(loginResult) {
+						console.log('loginResult',loginResult)
+			            const data = {
+			                encryptedData: userInfoResult.detail.encryptedData,
+			                iv: userInfoResult.detail.iv,
+			                rawData: userInfoResult.detail.rawData,
+			                signature: userInfoResult.detail.signature,
+			                code: loginResult.code,
+			            };
+			            _this.$request({
+			                url: _this.$api.passport.login,
+			                method: 'post',
+			                data: data
+			            }).then(response => {
+			                uni.hideLoading();
+			                if (response.code === 0) {
+			                    uni.showToast({
+			                        title: '资料已更新',
+			                        icon: 'none'
+			                    });
+			                    _this.$storage.setStorageSync('_USER_ACCESS_TOKEN', response.data.access_token);
+			                } else {
+			                    return reject(response.msg);
+			                }
+			            });
+			        }
+			    });
+			    // #endif
+			    // #ifdef H5
+			    this.$request({
+			        url: this.$api.registered.url,
+			        method: 'get',
+			        data: {
+			            scope: 'snsapi_userinfo',
+			            response_type: 'code',
+			            url: `${window.location.href}`
+			        }
+			    }).then(res => {
+			        if (res.code === 0) {
+			            this.$storage.setStorageSync('_USER_SIGN', true);
+			            window.location.replace(res.data.url);
+			        } else {
+			            uni.navigateTo({
+			                url: '/pages/registered/sign'
+			            });
+			        }
+			    });
+			    // #endif
 			}
 		}
 	}
@@ -688,8 +690,8 @@
 
 
 	.u-refresh {
-		border-radius: 18upx;
-		border: 1upx solid #CDCCCB;
+		border-radius: 8rpx;
+		border: 1rpx solid #CDCCCB;
 		min-width: 69upx;
 		margin: 0 0 0 10upx;
 		box-sizing: content-box;
@@ -709,7 +711,7 @@
 
 		text {
 			line-height: 1;
-			color: #CDCCCB;
+			color: #999999;
 			font-size: 21upx;
 		}
 	}

+ 2 - 2
src/pages/case/appointment/appointment-list.vue

xqd xqd
@@ -19,7 +19,7 @@
 				<view class="line"></view>
 				<view class="main-between cross-center addr">
 					<view class="t-omit" style="width: 400rpx;">活动地点:{{item.address}}</view>
-					<!-- <button class="appointment-now" size="mini" :style="{'background-color':getTheme.background,}">去预约</button> -->
+					<button class="appointment-now" style="padding: 0;border-radius: 0;" size="mini" :style="{'background-color':getTheme.background}">去预约</button>
 				</view>
 			</view>
 			<appNoData v-if="VisitList.length===0" :title="'暂无预约'"></appNoData>
@@ -195,7 +195,7 @@
 				line-height: 22rpx;
 			}
 			.appointment-now{
-				width: 150rpx;
+				width: 118rpx;
 				font-size: 22rpx;
 				height: 100%;
 				color: #fff;

+ 1 - 1
src/pages/case/hot_sale_project.vue

xqd
@@ -38,7 +38,7 @@
 				</view>
 			</view>
 			<view class="no-more" v-if="noMore && CompositionList.length>0">没有更多了...</view>
-			<appNoData v-if="CompositionList.length==0" :background="'#f8f8f8'" :title="'该分类暂无套'"></appNoData>
+			<appNoData v-if="CompositionList.length==0" :background="'#f8f8f8'" :title="'该分类暂无套'"></appNoData>
 		</view>
 	</view>
 </template>

+ 1 - 1
src/pages/goods/goods.vue

xqd
@@ -133,7 +133,7 @@
                             <bd-service :name="name" :url="sendPath"></bd-service>
                         </template>
                         <view class="bd-back dir-top-nowrap main-center cross-center box-grow-0" @click="setFavorite">
-                            <image class="bd-icon" :src="favorite ? 'https://shop.9026.com/web/statics/image/mall/static/icon/icon-favorite-active.png' : 'https://shop.9026.com/web/statics/image/mall/static/icon/icon-favorite.png'"></image>
+                            <image class="bd-icon" :src="favorite ? 'https://t17.9026.com/web/statics/image/index/icon-favorite-active.png' : 'https://t17.9026.com/web/statics/image/index/icon-favorite.png'"></image>
                             <text class="bd-text">收藏</text>
                         </view>
                         <template v-if="is_negotiable !== 1">

+ 1 - 1
src/pages/index/binding/bindingSale.vue

xqd
@@ -13,7 +13,7 @@
 					<!-- <text class="pla">更多</text><image class="arrow-right" src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png" mode=""></image> -->
 					</view>
 			</view>
-			<view class="main-between cross-center item" v-for="(item,index) in dataList" :key="index" @click="selectSale(index,item.id,item.salesperson.name)">
+			<view class="main-between cross-center item" v-for="(item,index) in dataList" :key="index" @click="selectSale(index,item.sale_id,item.salesperson.name)">
 				<view class="main-left">
 					<image style="width: 79rpx;height: 79rpx;border-radius: 50%;margin-right: 24rpx;" :src="item.salesperson.pic_url" mode=""></image>
 					<view>

+ 5 - 5
src/pages/index/hxj_index_component.vue

xqd xqd xqd xqd xqd
@@ -25,7 +25,7 @@
 		  v-bind:name="homePages[1].data.name"
 		  v-bind:textColor="homePages[1].data.textColor"
 		></u-announcement>
-		<view class="link">
+		<view class="link" style="margin-top: 30rpx;">
 			<view>
 				<view class="title">人居 · 荟享家<image class="hxjImg"
 						src="https://t17.9026.com/web/statics/image/index/HUIXIANGJIA.png" mode=""></image>
@@ -34,7 +34,7 @@
 		</view>
 		<app-scroll-list :list="list"></app-scroll-list>
 		<view class="link">
-			<view class="title1">本期家点灵感</view>
+			<view class="title1" style="margin-left: 20rpx;">本期家点灵感</view>
 			<image class="tyx" src="https://t17.9026.com/web/statics/image/index/tyx.png" mode=""></image>
 			<image class="d6" src="https://t17.9026.com/web/statics/image/index/6d.png" mode=""></image>
 			<view class="subtitle">臻选整装 · 安全无甲醛 · 7天入住</view>
@@ -114,7 +114,7 @@
 						<image class="borradu_20"
 							:src="item.icon_url"
 							mode=""></image>
-						<view class="title_2">{{item.name}}</view>
+						<view class="title_2" style="margin-top: 35rpx;">{{item.name}}</view>
 						<view class="desc_2">独到品味的代表备份</view>
 					</view>
 				</view>
@@ -140,7 +140,7 @@
 		</view>
 
 		<view class="group_list">
-			<swiper style="height: 606rpx;" :indicator-dots="false" :autoplay="false" :interval="3000" :duration="1000"
+			<swiper style="height: 556rpx;" :indicator-dots="false" :autoplay="false" :interval="3000" :duration="1000"
 				previous-margin="25rpx" next-margin="25rpx" :current="ptCurrent"  @change="ptChange">
 				<swiper-item class="" v-for="(item,index) in homePages[9].data.list" :key="index"
 					@click="goPage(item.page_url)">
@@ -172,7 +172,7 @@
 			<view class="title1" style="margin-right: 61rpx;color: #A7A7A7;">精选类别</view>
 			<view class="title1" style="margin-right: 61rpx;color: #A7A7A7;">精选类别</view>
 			<view class="title1" style="margin-right: 61rpx;color: #A7A7A7;">精选类别</view> -->
-			<view class="title1" style="margin-right: 61rpx;" :style="{'color':bottom_goods_index===index?'':'#A7A7A7'}" v-for="(item,index) in homePages[11].data.catList" :key="index" @click="selectCat(index)">{{item.menuName}}</view>
+			<view class="title1" style="margin-right: 43rpx;margin-left: 18rpx;" :style="{'color':bottom_goods_index===index?'':'#A7A7A7'}" v-for="(item,index) in homePages[11].data.catList" :key="index" @click="selectCat(index)">{{item.menuName}}</view>
 			<image class="tyx" src="https://t17.9026.com/web/statics/image/index/tyx.png" mode=""></image>
 		</view>
 		<view class="hxzy">

+ 6 - 3
src/pages/index/index.scss

xqd xqd xqd xqd
@@ -38,7 +38,7 @@
 		height: 37rpx;
 		position: absolute;
 		top: 26rpx;
-		left: 24rpx;
+		left: 40rpx;
 		z-index: 1;
 	}
 	.d6 {
@@ -54,7 +54,7 @@
 		font-size: 24rpx;
 		font-weight: 400;
 		color: #a7a7a7;
-		line-height: 34rpx;
+		line-height: 48rpx;
 	}
 	.coupon_1 {
 		width: 15rpx;
@@ -252,7 +252,7 @@
 		margin-right: 25rpx;
 		position: relative;
 		background-image: url(https://t17.9026.com/web/statics/image/index/coupon_masking.png);
-		background-size: 310rpx 200rpx;
+		background-size: 320rpx 200rpx;
 		.Wb {
 			display: flex;
 			flex-flow: column;
@@ -275,6 +275,9 @@
 			}
 		}
 	}
+	&>.item:last-child{
+		margin-right: 0;
+	}
 }
 
 .hxdz {

+ 3 - 3
src/pages/order-submit/app-submit-goods.vue

xqd xqd
@@ -54,7 +54,7 @@
                   :key="compositionIndex">
 					<view class="main-between info-box">
 						<view class="main-left">
-							<image class="gd-cover" :src="compositionItem.goods_list[0].goods_attr.pic_url ? compositionItem.goods_list[0].goods_attr.pic_url : compositionItem.goods_list[0].cover_pic" mode=""></image>
+							<image class="gd-cover" :src="compositionItem.cover_img ? compositionItem.cover_img : compositionItem.goods_list[0].cover_pic" mode=""></image>
 							<view>
 								<view class="title t-omit">{{compositionItem.name}}</view>
 								<view>
@@ -67,12 +67,12 @@
 								</view>
 								<view class="main-between">
 									<view class="main-left">
-										<!-- <view class="tag">{{info.tag}}</view> -->
+										<view class="tag">{{compositionItem.tag}}</view>
 										<view class="tag">套装</view>
 										<!-- <view class="tag">满200减10</view> -->
 									</view>
 								</view>
-								<view class="cross-center hxj-compositionItem-show" @click="showGoodsList=!showGoodsList">包含<text class="t-omit" style="width: 150rpx;">{{compositionItem.name}}</text>等{{compositionItem.goods_list.length}}个商品<image style="width: 28rpx;height: 28rpx;" :src="showGoodsList?'../../static/image/index/arrow-12.png':'../../static/image/index/arrow-11.png'" mode=""></image></view>
+								<view class="cross-center hxj-compositionItem-show" @click="showGoodsList=!showGoodsList">包含<text class="t-omit" style="width: 150rpx;">{{compositionItem.name}}</text>等{{compositionItem.goods_list.length}}个商品<image style="width: 28rpx;height: 28rpx;" :src="showGoodsList?'https://t17.9026.com/web/statics/image/index/arrow-12.png':'https://t17.9026.com/web/statics/image/index/arrow-11.png'" mode=""></image></view>
 							</view>
 						</view>
 						<view class="cross-bottom">

+ 5 - 6
src/pages/order-submit/invoice/invoice.vue

xqd xqd xqd
@@ -50,13 +50,12 @@
 						placeholder-style="font-size: 28rpx;font-weight: 300;color: #999999;" />
 				</view>
 			</view>
-
 		</view>
 		<view class="form-box">
 			<view class="main-between cross-center item">
 				<view class="title_1">电话号码</view>
 				<view class="main-right cross-center">
-					<input type="text" v-model="invoice_info.phone" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
+					<input type="number" v-model="invoice_info.phone" placeholder="请输入" style="text-align: right;font-size: 28rpx;" maxlength="11"
 						placeholder-style="font-size: 28rpx;font-weight: 300;color: #999999;" />
 				</view>
 			</view>
@@ -80,7 +79,7 @@
 			<view class="main-between cross-center item">
 				<view class="title_1">开票金额<text>*</text></view>
 				<view class="main-right cross-center">
-					<input type="digit" v-model="invoice_info.amount" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
+					<input type="digit" v-model="invoice_info.amount" placeholder="请输入" style="text-align: right;font-size: 28rpx;" disabled
 						placeholder-style="font-size: 28rpx;font-weight: 300;color: #999999;" />
 				</view>
 			</view>
@@ -125,12 +124,12 @@
 				deep:true
 			}
 		},
-		onLoad() {
+		onLoad(option) {
 			let storageInvoiceInfo=this.$storage.getStorageSync('invoice_info')
 			if(storageInvoiceInfo){
-				this.invoice_info.delivery_address=storageInvoiceInfo.delivery_address
-				this.invoice_info.user_address_id=storageInvoiceInfo.user_address_id
+				this.invoice_info=storageInvoiceInfo
 			}
+			this.invoice_info.amount=option.amount;
 		},
 		methods: {
 			submit(){

+ 1 - 1
src/pages/order-submit/order-submit.vue

xqd
@@ -928,7 +928,7 @@
 			},
 			navigateInvoice() {
 				uni.navigateTo({
-					url: '/pages/order-submit/invoice/invoice'
+					url: `/pages/order-submit/invoice/invoice?amount=${this.previewData.mch_list[0].total_goods_price}`
 				})
 			},
 			navigateInvoiceAddr() {

+ 3 - 3
src/pages/order/index/index.vue

xqd xqd
@@ -80,7 +80,7 @@
                                                     </template>
                                                     <!-- 核销 -->
                                                     <!-- 到店自提订单 在核销前有收款操作 -->
-                                                    <template v-if='item.send_type ==1 && item.is_confirm == 0 && item.cancel_status == 0'>
+                                                    <template v-if='item.send_type ==1 && item.is_confirm == 0 && item.cancel_status == 0 && item.new_status < 2'>
                                                         <view @click='getClerkCode(item)' class='order-btn'>核销码</view>
                                                     </template>
                                                     <template v-if='item.action_status.is_show_comment == 1'>
@@ -92,11 +92,11 @@
                                             <!-- 已支付订单操作 start -->
                                             <template v-else>
                                                 <!-- 待付款 -->
-                                                <template v-if='item.is_pay == 0'>
+                                                <template v-if='item.is_pay == 0 && item.cancel_status == 0'>
                                                     <view @click="cancel(item)" class='order-btn'>取消</view>
                                                     <view @click='orderPay(item)' class='order-btn'>付款</view>
                                                 </template>
-                                                <template v-if='item.status == 1'>
+                                                <template v-if='item.status == 1 && item.new_status < 2'>
                                                     <!-- 核销 -->
                                                     <!-- 到店自提订单 未支付不显示核销码 | 未支付 货到付款订单显示核销码 -->
                                                     <template v-if='item.send_type ==1 && item.is_confirm == 0 && ((item.is_pay == 0 && item.pay_type == 2) || (item.is_pay == 1 && item.pay_type != 2))'>

+ 12 - 3
src/pages/sale/cusmter/addCustomer.vue

xqd xqd xqd xqd
@@ -19,7 +19,7 @@
 				</view>
 				<view class="main-left cross-center linp border_bottom">
 					<view class="field">手机号</view>
-					<input type="text" v-model="form.mobile" placeholder="请输入手机号" placeholder-style="font-size:28rpx" />
+					<input type="text" v-model="form.mobile" maxlength="11" placeholder="请输入手机号" placeholder-style="font-size:28rpx" />
 				</view>
 			</view>
 		</view>
@@ -79,7 +79,8 @@
 					mobile: '',
 					name: '',
 					estates: []
-				}
+				},
+				setTimer:''
 			};
 		},
 		onLoad(option) {
@@ -274,8 +275,13 @@
 					if(res.code===0){
 						uni.showToast({
 							title:this.form.sale_customer_id?'编辑成功':'添加成功',
+							success: () => {
+								this.setTimer=setTimeout(()=>{
+									uni.navigateBack()
+								},1500)
+							}
 						})
-						uni.navigateBack()
+						
 					}else{
 						uni.showToast({
 							title:res.msg,
@@ -289,6 +295,9 @@
 					})
 				})
 			}
+		},
+		onHide() {
+			clearTimeout(this.setTimer)
 		}
 	}
 </script>

+ 3 - 2
src/pages/sale/cusmter/info.vue

xqd
@@ -4,8 +4,9 @@
 			<view class="main-left">
 				<image style="width: 91rpx;height: 91rpx;border-radius: 50%;margin-right: 25rpx;" :src="info.avatar" mode=""></image>
 				<view class="main-between-y">
-					<view class="main-left name cross-center t-omit">{{info.name}}
-					<image style="width: 21rpx;height: 29rpx;margin: 0 28rpx 0 7rpx;" src="https://t17.9026.com/web/statics/image/sale/sex0.png" mode=""></image>
+					<view class="main-left name cross-center">
+					<text style="width: 330rpx;" class="t-omit">{{info.name}}</text>
+					<!-- <image style="width: 21rpx;height: 29rpx;margin: 0 28rpx 0 7rpx;" src="https://t17.9026.com/web/statics/image/sale/sex0.png" mode=""></image> -->
 					<!-- <image style="width: 21rpx;height: 29rpx;margin: 0 28rpx 0 7rpx;" src="https://t17.9026.com/web/statics/image/sale/sex1.png" mode=""></image> -->
 						<image style="width: 96rpx;height: 31rpx;" :src="info.is_verify==1?'https://t17.9026.com/web/statics/image/index/ysm.png':''" mode=""></image>
 					</view>

+ 1 - 1
src/pages/sale/myCommission.vue

xqd
@@ -13,7 +13,7 @@
 		</view>
 		<view class="list">
 			<view class="cross-center hjx-ts-30 hjx-tc-666" style="padding: 32rpx 0;">
-				已发放提成<image style="width: 30rpx;height: 25rpx;margin-left: 8rpx;" src="../../static/image/sale/tcff.png" mode=""></image>
+				已发放提成<image style="width: 30rpx;height: 25rpx;margin-left: 8rpx;" src="https://t17.9026.com/web/statics/image/sale/tcff.png" mode=""></image>
 			</view>
 			<view style="width: 100%;height: 1px;background: #EAEAEA;"></view>
 			<view class="main-between cross-center item" :class="{'item-line':true}" v-for="(item,index) in dataInfo.list" :key="index">

+ 1 - 1
src/pages/sale/sale_login/sale_login.vue

xqd
@@ -8,7 +8,7 @@
 		<view class="login_form">
 			<view class="item">
 				<view class="title">手机号</view>
-				<input class="input" v-model="account" type="number" placeholder-class="plh_class" placeholder="请输入您的手机号" />
+				<input class="input" v-model="account" maxlength="11" type="number" placeholder-class="plh_class" placeholder="请输入您的手机号" />
 				<view class="b_line"></view>
 			</view>
 			<view class="item">

+ 8 - 7
src/pages/search/search.vue

xqd xqd xqd
@@ -86,15 +86,15 @@
                             </view>
                         </view>
                     </template>
-                    <view style="background-color: #f7f7f7;padding: 0 20rpx;">
+                    <view style="background-color: #f7f7f7;padding: 20rpx 20rpx;">
 						<view class="item" v-for="(item,index) in CompositionList" :key="index" @click="$jump({'open_type':'navigate','url':`/pages/case/projectInfo?id=${item.id}`})">
 							<view class="main-between img">
 								<view style="width: 419rpx;height: 281rpx;">
-									<image style="width: 420rpx;height: 420rpx;" :src="item.cover_img" mode=""></image>
+									<image style="width: 434rpx;height: 434rpx;" :src="item.cover_img" mode=""></image>
 								</view>
-								<view style="width: 206rpx;">
-									<image style="width: 206rpx;height: 206rpx;" :src="item.banner_imgs[0].banner_imgs" mode=""></image>
-									<image style="width: 206rpx;height: 206rpx;" :src="item.banner_imgs[1].banner_imgs" mode=""></image>
+								<view style="width: 218rpx;">
+									<image style="width: 218rpx;height: 218rpx;" :src="item.banner_imgs[0].banner_imgs" mode=""></image>
+									<image style="width: 218rpx;height: 218rpx;" :src="item.banner_imgs[1].banner_imgs" mode=""></image>
 								</view>
 							</view>
 							<view class="main-between pl" >
@@ -389,7 +389,8 @@ export default {
 			        // mch_id: this.mch_id,
 					limit:10,
 			        page: page,
-			    }
+			    },
+				method:'post'
 			})
 			if (compositionList.code === 0) {
 			    if (page === 1) this.CompositionList = [];
@@ -672,7 +673,7 @@ export default {
         }
 		//composition
 		.item{
-			width: 678rpx;
+			width: 710rpx;
 			height: auto;
 			background: #FFFFFF;
 			border-radius: 8rpx;

+ 11 - 2
src/pages/user-center/about-mall/ComplaintsSuggestions.vue

xqd xqd xqd
@@ -33,7 +33,8 @@
 		data() {
 			return {
 				content:'',
-				imgs:[]
+				imgs:[],
+				setTimer:'',
 			};
 		},
 		methods:{
@@ -55,7 +56,12 @@
 				}).then(res=>{
 					if(res.code===0){
 						uni.showToast({
-							title:'成功'
+							title:'提交成功',
+							success: () => {
+								this.setTimer=setTimeout(()=>{
+									uni.navigateBack()
+								},2000)	
+							}
 						})
 					}
 				})
@@ -64,6 +70,9 @@
 			imageEvent(e) {
 				this.imgs = e.imageList;
 			},
+		},
+		onHide() {
+			clearTimeout(this.setTimer)
 		}
 	}
 </script>

+ 1 - 1
src/pages/user-center/privacyAgreement/privacyAgreement.vue

xqd
@@ -5,7 +5,7 @@
 		<view class="login-btn-box">
 			<button class="main-center cross-center login-btn" :style="{'opacity':readUserAgreement?'1':'0.39'}" v-if="content" @click="login">
 				<image style="width: 40rpx;height: 40rpx;margin-right: 10rpx;"
-					src="../../../static/image/index/wxlogin.png" mode=""></image>立即登录
+					src="https://t17.9026.com/web/statics/image/index/wxlogin.png" mode=""></image>立即登录
 			</button>
 		</view>
 	</view>

+ 1 - 0
src/plugins/composition/detail/detail.vue

xqd
@@ -560,6 +560,7 @@
 			font-size: #{32rpx};
 			line-height: #{78rpx};
 			text-align: center;
+			margin: 0 auto;
 		}
 
 		.discount {

BIN
src/static/image.zip