修改页面还原度问题

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

@@ -208,7 +208,7 @@
 						</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 member-margin"
+						<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>
@@ -223,7 +223,7 @@
 						<!-- #endif-->
 					</view>
 					<view class="number" :style="{'color':userNameColor}">
-						15100997644
+						{{userInfo.mobile}}
 					</view>
 				</template>
 				<template v-else>

src/components/page-component/goods/bd-service.vue

@@ -2,7 +2,7 @@
     <!-- #ifndef MP-TOUTIAO || MP-ALIPAY || H5 -->
     <view class="bd-item-content" v-if="mall.setting.show_contact_type != 0">
         <view v-if="mall.setting.show_contact_type == 2" class="bd-back dir-top-nowrap main-center cross-center box-grow-0" @click="router('/pages/web/web?url=' + encodeURIComponent(mall.setting.web_service_url))">
-            <image class="bd-icon" src="https://shop.9026.com/web/statics/image/mall/static/icon/detail-tell.png"></image>
+            <image class="bd-icon" src="https://t17.9026.com/web/statics/image/index/detail-tell.png"></image>
             <text class="bd-text">客服</text>
         </view>
         <button v-if="mall.setting.show_contact_type == 1"
@@ -12,12 +12,12 @@
                 :send-message-path="url"
                 class="bd-content bd-back box-grow-0">
             <view class="bd-content-view dir-top-nowrap main-center cross-center ">
-                <image class="bd-icon" src="https://shop.9026.com/web/statics/image/mall/static/icon/detail-tell.png"></image>
+                <image class="bd-icon" src="https://t17.9026.com/web/statics/image/index/detail-tell.png"></image>
                 <text class="bd-text">客服</text>
             </view>
         </button>
         <view v-if="mall.setting.show_contact_type == 3" class="bd-item-content dir-top-nowrap main-center cross-center box-grow-0" @click="makePhoneCall()">
-            <image class="bd-icon" src="https://shop.9026.com/web/statics/image/mall/static/icon/detail-tell.png"></image>
+            <image class="bd-icon" src="https://t17.9026.com/web/statics/image/index/detail-tell.png"></image>
             <text class="bd-text">客服</text>
         </view>
     </view>
@@ -25,11 +25,11 @@
     <!-- #ifdef MP-TOUTIAO || MP-ALIPAY || H5 -->
    <view>
        <view v-if="mall.setting.show_contact_type == 2" class="bd-item-content dir-top-nowrap main-center cross-center box-grow-0" @click="router('/pages/web/web?url=' + encodeURIComponent(mall.setting.web_service_url))">
-           <image class="bd-icon" src="https://shop.9026.com/web/statics/image/mall/static/icon/detail-tell.png"></image>
+           <image class="bd-icon" src="https://t17.9026.com/web/statics/image/index/detail-tell.png"></image>
            <text class="bd-text">客服</text>
        </view>
        <view v-else-if="mall.setting.show_contact_type == 3" class="bd-item-content dir-top-nowrap main-center cross-center box-grow-0" @click="makePhoneCall()">
-           <image class="bd-icon" src="https://shop.9026.com/web/statics/image/mall/static/icon/detail-tell.png"></image>
+           <image class="bd-icon" src="https://t17.9026.com/web/statics/image/index/detail-tell.png"></image>
            <text class="bd-text">客服</text>
        </view>
    </view>

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

@@ -17,18 +17,20 @@
 					</view>
 				</view>
 				<view class="line"></view>
-				<view class="addr">
-					<view class="t-omit">活动地点：{{item.address}}</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>
 				</view>
 			</view>
 			<appNoData v-if="VisitList.length===0" :title="'暂无预约'"></appNoData>
-			<view class="no-more" v-if="noMore">没有更多了...</view>
+			<view class="no-more" v-if="noMore && VisitList.length>0">没有更多了...</view>
 		</view>
 	</view>
 	</app-layout>
 </template>
 
 <script>
+	import {mapGetters} from 'vuex'
 	import appNoData from '@/components/page-component/app-no-goods/app-no-goods.vue'
 	export default {
 		components:{
@@ -42,6 +44,11 @@
 				noMore:false
 			};
 		},
+		computed:{
+			...mapGetters('mallConfig', {
+			    getTheme: 'getTheme',
+			}),
+		},
 		onLoad(option) {
 			'is_myself' in option?this.is_myself=option.is_myself:''
 			this.getVisitList()
@@ -187,6 +194,13 @@
 				color: #999999;
 				line-height: 22rpx;
 			}
+			.appointment-now{
+				width: 150rpx;
+				font-size: 22rpx;
+				height: 100%;
+				color: #fff;
+				margin: 0;
+			}
 		}
 	}
 </style>

src/pages/case/components/hxj-bd-info.vue

@@ -8,7 +8,7 @@
 					<view class="hxj-ynum">已售{{sales}}+</view>
 				</view>
 				<view class="main-left cross-center hjx-tc-999 hjx-ts-22">
-					<view style="margin-right: 31rpx;">{{house_layout}} {{measure}}</view>
+					<view style="margin-right: 31rpx;">{{house_layout}} {{estate_name}} {{measure}}</view>
 					<view class="hjx-text-decoration-line-through">{{originalPrice}}元</view>
 				</view>
 				<view class="hjx-tc-AE8445 hjx-ts-22 hjx-tw-500" style="margin:26rpx 0 22rpx ;">券后价</view>
@@ -66,6 +66,7 @@
 			goodsId: Number,
 			goods: Object,
 			house_layout:String,
+			estate_name:String,
 			measure:String,
 			isShowShare: {
 				type: Boolean,
@@ -153,12 +154,12 @@
 		padding: 43rpx 30rpx 28rpx 46rpx;
 
 		.hxj-name {
-			width: 360rpx;
+			max-width: 360rpx;
 			font-size: 28rpx;
 			font-weight: 500;
 			color: #121212;
 			line-height: 56rpx;
-			margin-right: 14rpx;
+			margin-right: 24rpx;
 		}
 
 		.hxj-tags {

src/pages/case/hot_sale_project.vue

@@ -30,7 +30,7 @@
 					<view class="main-between-y">
 						<view class="title t-omit">{{item.name}}</view>
 						<view class="desc">已售:{{item.sale_num}}套 | {{item.collect_num}}人收藏</view>
-						<view class="price"><text>￥</text>{{item.price}}</view>
+						<view class="price"><text>￥</text>{{item.actual_price}}</view>
 					</view>
 					<view class="cross-bottom arrow-right">
 						<image src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png" mode=""></image>
@@ -176,9 +176,13 @@
 					font-size: 22rpx;
 					font-weight: 500;
 					color: #999999;
+					line-height: 45rpx;
 				}
 				.price{
-					font-size: 28rpx;
+					text{
+						font-size: 28rpx;
+					}
+					font-size: 38rpx;
 					font-weight: 500;
 					color: #F93F3F;
 				}

src/pages/case/projectInfo.vue

@@ -7,7 +7,7 @@
 
 			<!--商品轮播图-->
 			<app-goods-banner :pic-list="compositionList.banner_imgs" :range-key="'banner_imgs'"
-				 :goods_id="compositionList.id" :isCart="false"></app-goods-banner>
+				:goods_id="compositionList.id" :isCart="false"></app-goods-banner>
 			<!-- 套装内商品 -->
 			<view style="background-color: #fff;">
 				<view class="link ">
@@ -19,35 +19,42 @@
 					</view>
 				</view>
 				<hxj-scroll-list :itemWidth="'168rpx'" :itemHeight="'168rpx'" :list="list"></hxj-scroll-list>
-				<hxj-bd-info :theme="getTheme" :name="compositionList.name" :discount_amount="compositionList.discount_amount" :original-price="compositionList.price"
-					:sales="Number(compositionList.sale_num)+Number(compositionList.virtual_sale_num)" :tag="compositionList.tag" :measure="compositionList.measure" :house_layout="compositionList.exampleHouse.name" :goods-id="compositionList.id" :coupons="goods_coupon_center" :extra-quick-share="extra_quick_share"
+				<hxj-bd-info :theme="getTheme" :name="compositionList.name"
+					:discount_amount="compositionList.discount_amount" :original-price="compositionList.actual_price"
+					:sales="Number(compositionList.sale_num)+Number(compositionList.virtual_sale_num)"
+					:tag="compositionList.tag" :measure="compositionList.measure" :estate_name="compositionList.estate.name"
+					:house_layout="compositionList.exampleHouse.name" :goods-id="compositionList.id"
+					:coupons="goods_coupon_center" :extra-quick-share="extra_quick_share"
 					:app-share-pic="app_share_pic ? app_share_pic : goods.pic_url[0].pic_url"
 					:app-share-title="compositionList.name"
 					:poster-config="poster_config + `&composition_id=` + compositionList.id"
-					:poster-generate="poster_generate + `&composition_id=` + compositionList.id" :has-poster-nav="true" :goods="goods"
-					@share="hShareAppMessage" @quickShare="quickShare" @receive="receive">
+					:poster-generate="poster_generate + `&composition_id=` + compositionList.id" :has-poster-nav="true"
+					:goods="goods" @share="hShareAppMessage" @quickShare="quickShare" @receive="receive">
 				</hxj-bd-info>
-				<view class="hxj-goods-list" :style="{ height: isOpen ? 'auto' : '270rpx' }">
+				<view class="hxj-goods-list" :style="{ height: isOpen ? 'auto' : '302rpx' }">
 					<view class="main-between" style="width: 560rpx;">
 						<view class="title">套装内商品</view>
 						<view class="title">数量</view>
 					</view>
-					<view class="main-between item"
-						v-for="(item, index) in list"
-						:key="index">
-						<view class="main-between" style="width: 560rpx;">
-							<view class="name t-omit">{{item.name}}</view>
-							<view class="num">x{{item.goods_num}}</view>
-						</view>
-						<view class="zk cropss-center" v-if="index === 1 &&list.length>2 && isOpen === false" @click="isOpen = true">
-							展开
-							<image src="https://t17.9026.com/web/statics/image/user-center/arrow-bottom.png" mode="">
-							</image>
-						</view>
-						<view class="zk cropss-center" v-if="index===list.length-1 && isOpen === true" @click="isOpen = false">
-							收起
-							<image src="https://t17.9026.com/web/statics/image/user-center/arrow-top.png" mode="">
-							</image>
+					<view  v-for="(item, index) in list" :key="index">
+						<view style="width: 525rpx;height: 1px;background: #EFEFEF;opacity: 0.63;margin-left: 62rpx;"></view>
+						<view class="main-between item">
+							<view class="main-between" style="width: 560rpx;">
+								<view class="name t-omit">{{item.name}}</view>
+								<view class="num">x{{item.goods_num}}</view>
+							</view>
+							<view class="zk cropss-center" v-if="index === 1 &&list.length>2 && isOpen === false"
+								@click="isOpen = true">
+								展开
+								<image src="https://t17.9026.com/web/statics/image/user-center/arrow-bottom.png" mode="">
+								</image>
+							</view>
+							<view class="zk cropss-center" v-if="index===list.length-1 && isOpen === true"
+								@click="isOpen = false">
+								收起
+								<image src="https://t17.9026.com/web/statics/image/user-center/arrow-top.png" mode="">
+								</image>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -77,11 +84,11 @@
 				</view>
 				<view class="bd-bottom u-bottom-height-0 cross-center dir-left-nowrap">
 					<template v-if="exchangeStatus == null">
-						<view class="bd-back dir-top-nowrap main-center cross-center box-grow-0" @click="back">
+						<!-- <view class="bd-back dir-top-nowrap main-center cross-center box-grow-0" @click="back">
 							<image class="bd-icon"
 								src="https://shop.9026.com/web/statics/image/mall/static/icon/index.png"></image>
 							<text class="bd-text">首页</text>
-						</view>
+						</view> -->
 						<template v-if="is_negotiable !== 1">
 							<!-- 客服组件 -->
 							<bd-service :name="name" :url="sendPath"></bd-service>
@@ -89,8 +96,8 @@
 						<view class="bd-back dir-top-nowrap main-center cross-center box-grow-0" @click="setCollect">
 							<image class="bd-icon" :src="
 									compositionList.is_collect
-										? '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'
+										? '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>
@@ -106,8 +113,7 @@
 									}" :class="['bd-btn', leftTip]">
 									加入购物车
 								</view> -->
-								<view :class="['box-grow-1']"
-									v-if="!(isTip == 0 && sell_time > 0)">
+								<view :class="['box-grow-1']" v-if="!(isTip == 0 && sell_time > 0)">
 									<app-jump-button form>
 										<view @click="clickAttr(1)" :style="{
 												background: getTheme.background_gradient_btn ? getTheme.background_gradient_btn : '#999999',
@@ -224,11 +230,11 @@
 		},
 		data() {
 			return {
-				id:'',//套餐id
+				id: '', //套餐id
 				isCouponShow: false,
 				list: [],
 				isOpen: false, //hxj套装内商品是否展开
-				compositionList:{}, //套餐详情
+				compositionList: {}, //套餐详情
 
 				showClose: false,
 				is_open: 0,
@@ -525,14 +531,19 @@
 					},
 					method: 'post'
 				}).then(res => {
-					if(res.code===0){
-						this.compositionList=res.data
+					if (res.code === 0) {
+						this.compositionList = res.data
 						for (let i = 0; i < this.compositionList.compositionGoods.length; i++) {
-							let image=this.compositionList.compositionGoods[i].goods.cover_pic
-							let id=this.compositionList.compositionGoods[i].goods.id
-							let name=this.compositionList.compositionGoods[i].goods.name
-							let goods_num=this.compositionList.compositionGoods[i].goods_num
-							this.list.push({image,link:`/pages/goods/goods?id=${id}`,name,goods_num})
+							let image = this.compositionList.compositionGoods[i].goods.cover_pic
+							let id = this.compositionList.compositionGoods[i].goods.id
+							let name = this.compositionList.compositionGoods[i].goods.name
+							let goods_num = this.compositionList.compositionGoods[i].goods_num
+							this.list.push({
+								image,
+								link: `/pages/goods/goods?id=${id}`,
+								name,
+								goods_num
+							})
 						}
 					}
 					this.$hideLoading();
@@ -541,12 +552,12 @@
 					url: this.$api.coupon.list,
 					data: {
 						composition_id: id,
-						limit:100,
+						limit: 100,
 					},
 					method: 'get'
 				}).then(res => {
-					if(res.code===0){
-						this.goods_coupon_center=res.data.list
+					if (res.code === 0) {
+						this.goods_coupon_center = res.data.list
 					}
 				})
 				// return new Promise((resolve, reject) => {
@@ -697,10 +708,11 @@
 					data: {
 						composition_id: this.id
 					},
-					method:'post'
+					method: 'post'
 				}).then(response => {
 					if (response.code === 0) {
-						this.compositionList.is_collect==0?this.compositionList.is_collect=1:this.compositionList.is_collect=0
+						this.compositionList.is_collect == 0 ? this.compositionList.is_collect = 1 : this
+							.compositionList.is_collect = 0
 					} else {
 						uni.showModal({
 							title: '提示',
@@ -768,7 +780,7 @@
 
 	.hxj-goods-list {
 		width: 100%;
-		height: 270rpx;
+		height: 302rpx;
 		overflow: hidden;
 		padding: 50rpx 43rpx 50rpx 51rpx;
 		background-color: #fff;
@@ -781,6 +793,7 @@
 		}
 
 		.item {
+			height: 69rpx;
 			.name {
 				width: 300rpx;
 				font-size: 24rpx;

src/pages/favorite/favorite.vue

@@ -270,7 +270,6 @@
 							</view>
 						</good-action>
 					</view>
-					
 			</view>
 		</view>
 	</app-layout>
@@ -342,18 +341,18 @@ export default {
 		emit(index) {
 			this.goods_page = 1;
 			if (index === 0) {
-				this.is_goods = true;
 				this.left = 0;
 				this.statusTop = 85;
 				setTimeout(() => {
+					this.is_goods = true;
 					this.getCurrent = index;
 				});
 				this.getFavorite();
 			} else if (index === 1) {
 				setTimeout(() => {
 					this.is_goods = false;
-				}, 500);
-				this.getCurrent = index;
+					this.getCurrent = index;
+				} );
 				this.left = 375;
 				this.typeY = -800;
 				this.statusTop = -85;
@@ -424,7 +423,6 @@ export default {
 				if (this.rotate.right !== 0) {
 					this.rightSet = this.selectStatus;
 				}
-
 				this.getFavorite();
 				for (let i in this.rotate) {
 					this.rotate[i] = 0;

src/pages/index/binding/binding.vue

@@ -34,7 +34,7 @@
 				</view>
 			</AppAreaPicker>
 			<view class="line"></view>
-			<view class="main-between cross-center item" @click="selectBuild">
+			<view class="main-between cross-center item" @click="selectBuild()">
 				<view class="title_1">楼盘名称</view>
 				<view class="main-right cross-center">
 					<text :class="{'val':name!=='','pla':name===''}">{{name===''?'请选择':name}}</text>

src/pages/index/hxj_index_component.vue

@@ -11,6 +11,20 @@
 				<view :class="swiperKey===i?'view_active':''" v-for="(item1,i) in homePages[0].data.banners.length" :key="i"></view>
 			</view>
 		</view>
+		<u-announcement
+		  v-bind:bgColor="homePages[1].data.background"
+		  v-bind:btn-color="homePages[1].data.btnColor"
+		  v-bind:btn-height="homePages[1].data.btnHeight"
+		  v-bind:btn-radius="`${homePages[1].data.btnRadius}rpx`"
+		  v-bind:btn-text="homePages[1].data.btnText"
+		  v-bind:btn-text-color="homePages[1].data.btnTextColor"
+		  v-bind:btn-width="homePages[1].data.btnWidth"
+		  v-bind:content="homePages[1].data.content"
+		  v-bind:header-url="homePages[1].data.headerUrl"
+		  v-bind:icon="homePages[1].data.icon"
+		  v-bind:name="homePages[1].data.name"
+		  v-bind:textColor="homePages[1].data.textColor"
+		></u-announcement>
 		<view class="link">
 			<view>
 				<view class="title">人居 · 荟享家<image class="hxjImg"
@@ -127,14 +141,14 @@
 
 		<view class="group_list">
 			<swiper style="height: 606rpx;" :indicator-dots="false" :autoplay="false" :interval="3000" :duration="1000"
-				previous-margin="75rpx" next-margin="75rpx">
+				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)">
 					<view class="item">
-						<view class="imgBox">
+						<view class="imgBox" >
 							<image class="img" :src="item.cover_pic"></image>
 						</view>
-						<view class="b_card main-between">
+						<view class="b_card main-between" >
 							<view class="main-left cross-center left">
 								<view class="i">02</view>
 								<view class="q">:</view>
@@ -202,9 +216,11 @@
 <script>
 	import {mapState} from 'vuex'
 	import appScrollList from './components/scroll-list.vue'
+	import uAnnouncement from "@/components/page-component/u-announcement/u-announcement.vue";
 	export default {
 		components: {
-			appScrollList
+			appScrollList,
+			uAnnouncement
 		},
 		props: {
 			homePages: {
@@ -245,6 +261,7 @@
 		},
 		data() {
 			return {
+				ptCurrent:1,//拼图轮播第几个
 				pageData: '',
 				swiperKey: 0, //轮播位置
 				bottom_goods_index:0, //底部商品分类索引
@@ -406,6 +423,9 @@
 					this.$storage.setStorageSync('INDEX_MALL', storage);
 				}
 			},
+			ptChange(e){
+				this.ptCurrent=e.detail.current
+			}
 		}
 	}
 </script>
@@ -435,4 +455,23 @@
 			}
 		}
 	}
+	.ptcc{
+		animation:myfirst 0.5s infinite;
+		animation-iteration-count:1;
+		animation-fill-mode:forwards;
+		
+	}
+	// .ptee{
+	// 	animation:myfirst 0.5s infinite;
+	// 	animation-iteration-count:1;
+	// 	animation-fill-mode:forwards;
+	// 	animation-direction:reverse;
+	// }
+	@keyframes myfirst
+	{
+	    from   {height: 404rpx;}
+	    to   {margin-top: 40rpx;height: 365rpx!important;}
+	    
+	}
+	 
 </style>

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

@@ -52,15 +52,18 @@
         <view v-else class="composition">
             <view class="composition-item" v-for="(compositionItem, compositionIndex) in newList.composition_list"
                   :key="compositionIndex">
+				  <!-- <view>
+					  
+				  </view> -->
                 <view v-for="(goodsItem, goodsIndex) in compositionItem.goods_list" :key="goodsIndex"
-                      class="goods-item">
-                    <view class="dir-left-nowrap">
+                      class="goods-item" >
+                    <view class="dir-left-nowrap" >
                         <view class="box-grow-0" style="position: relative;">
                             <view v-if="goodsItem.address_disabled" class="address-disabled">不在配送范围内</view>
-                            <image class="goods-image"
+                            <image class="goods-image-composition"
                                    :src="goodsItem.goods_attr.pic_url ? goodsItem.goods_attr.pic_url : goodsItem.cover_pic"></image>
                         </view>
-                        <view class="box-grow-1 dir-top-nowrap">
+                        <view class="box-grow-1 dir-top-nowrap" >
                             <view class="goods-name box-grow-1">{{goodsItem.name}}</view>
                             <view class="box-grow-0">
                                 <view class="dir-left-wrap attr-list">
@@ -85,7 +88,7 @@
                                 </view>
                             </view>
                         </view>
-                    </view>
+                    </view >
                     <view v-for="(discount,discountIndex) in goodsItem.discounts"
                           :key="discountIndex"
                           :class="[themeTextClass]"
@@ -231,6 +234,13 @@
                 margin-right: #{24rpx};
                 font-size: #{24rpx};
             }
+			.goods-image-composition {
+			    width: #{106rpx};
+			    height: #{106rpx};
+			    display: block;
+			    margin-right: #{24rpx};
+			    font-size: #{24rpx};
+			}
 
             .goods-name {
                 white-space: nowrap;

src/pages/order-submit/invoice/invoice.vue

@@ -31,7 +31,7 @@
 				<view class="title_1">发票抬头<text>*</text></view>
 				<view class="main-right cross-center">
 					<input type="text" v-model="invoice_info.header_name" placeholder="企业名称" style="text-align: right;font-size: 28rpx;"
-						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
+						placeholder-style="font-size: 28rpx;font-weight: 300;color: #999999;" />
 				</view>
 			</view>
 			<view class="line"></view>
@@ -39,7 +39,7 @@
 				<view class="title_1">税号</view>
 				<view class="main-right cross-center">
 					<input type="text" v-model="invoice_info.duty_number" placeholder="抬头为企业单位时填写" style="text-align: right;font-size: 28rpx;"
-						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
+						placeholder-style="font-size: 28rpx;font-weight: 300;color: #999999;" />
 				</view>
 			</view>
 			<view class="line"></view>
@@ -47,7 +47,7 @@
 				<view class="title_1">单位地址</view>
 				<view class="main-right cross-center">
 					<input type="text" v-model="invoice_info.company_address" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
-						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
+						placeholder-style="font-size: 28rpx;font-weight: 300;color: #999999;" />
 				</view>
 			</view>
 
@@ -57,7 +57,7 @@
 				<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;"
-						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
+						placeholder-style="font-size: 28rpx;font-weight: 300;color: #999999;" />
 				</view>
 			</view>
 			<view class="line"></view>
@@ -65,7 +65,7 @@
 				<view class="title_1">开户银行</view>
 				<view class="main-right cross-center">
 					<input type="text" v-model="invoice_info.bank_name" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
-						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
+						placeholder-style="font-size: 28rpx;font-weight: 300;color: #999999;" />
 				</view>
 			</view>
 			<view class="line"></view>
@@ -73,7 +73,7 @@
 				<view class="title_1">银行账户</view>
 				<view class="main-right cross-center">
 					<input type="text" v-model="invoice_info.bank_account" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
-						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
+						placeholder-style="font-size: 28rpx;font-weight: 300;color: #999999;" />
 				</view>
 			</view>
 			<view class="line"></view>
@@ -81,7 +81,7 @@
 				<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;"
-						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
+						placeholder-style="font-size: 28rpx;font-weight: 300;color: #999999;" />
 				</view>
 			</view>
 
@@ -215,7 +215,7 @@
 
 		.pla {
 			font-size: 28rpx;
-			font-weight: 500;
+			font-weight: 300;
 			color: #999999;
 			margin-right: 20rpx;
 		}

src/pages/order-submit/invoice/invoiceAddr.vue

@@ -5,7 +5,7 @@
 				<view class="title_1">姓名</view>
 				<view class="main-right cross-center">
 					<input type="text" v-model="name" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
-						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
+						placeholder-style="font-size: 28rpx;font-weight: 300;color: #999999;" />
 				</view>
 			</view>
 			<view class="line"></view>
@@ -13,7 +13,7 @@
 				<view class="title_1">电话</view>
 				<view class="main-right cross-center">
 					<input type="text" v-model="phone" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
-						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
+						placeholder-style="font-size: 28rpx;font-weight:300;color: #999999;" />
 				</view>
 			</view>
 			<view class="line"></view>
@@ -21,7 +21,7 @@
 				<view class="title_1">地址</view>
 				<view class="main-right cross-center">
 					<input type="text" v-model="addr" placeholder="请输入" style="text-align: right;font-size: 28rpx;"
-						placeholder-style="font-size: 28rpx;font-weight: 500;color: #999999;" />
+						placeholder-style="font-size: 28rpx;font-weight: 300;color: #999999;" />
 				</view>
 			</view>
 		</view>

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

@@ -25,7 +25,7 @@
 						<app-address-bar :address="previewData.address" :has-ziti="previewData.has_ziti"
 							:all-ziti="previewData.allZiti" :city="mch.city"></app-address-bar>
 					</view> -->
-					<view :key="mchIndex" class="group">
+					<view :key="mchIndex" >
 						<!-- 循环商户列表start -->
 						<view style="padding: 26rpx 32rpx;" v-if="false">
 							<view class="dir-left-nowrap cross-center" style="padding: 10rpx 0;line-height: 1.2;">
@@ -160,9 +160,12 @@
 							style="height: 80rpx;line-height: 80rpx; background: #fff4f3;padding: 0 24rpx;">
 							<view>以下商品满{{mch.pick_up_price}}元起送</view>
 						</view>
-						<app-submit-goods :theme="theme" v-on:updateList="updateList" :index="mchIndex" :plugin="plugin"
-							:list="mch"></app-submit-goods>
-						<view class="line"></view>
+						<view class="group">
+							<app-submit-goods :theme="theme" v-on:updateList="updateList" :index="mchIndex" :plugin="plugin"
+								:list="mch"></app-submit-goods>
+						</view>
+						
+						<view class="group">
 						<template v-if="(mch.coupon && mch.coupon.enabled)">
 							<view style="padding: 20rpx 32rpx;">
 								<template v-if="mch.coupon && mch.coupon.enabled">
@@ -348,11 +351,22 @@
 							<view class="dir-left-nowrap cross-center" style="min-height: 84rpx; padding: 0 32rpx;">
 								<view class="box-grow-1">买家留言</view>
 								<view class="box-grow-0">
-									<textarea type="text" style="width: 460rpx;" maxlength="50" auto-height placeholder="填写您想要备注的信息，50字以内" placeholder-style="font-size: 24rpx;font-weight: 500;color: #999999;" />
+									<textarea type="text" style="width: 460rpx;" maxlength="50" auto-height placeholder="填写您想要备注的信息，50字以内" placeholder-style="font-size: 24rpx;color: #999999;" />
 								</view>
 							</view>
 						</template><!-- 买家留言end -->
-
+						</view>
+						
+						<view  class="group">
+							<view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
+								<view class="box-grow-1">商品总额</view>
+								<view class="box-grow-0">
+									<view :class="[themeTextClass]" :style="{'color': !is_gift ? theme.color : ''}">
+										¥{{balance < 0 ? setPrice(mch.total_price, balance) : FlorPrice(mch.total_price)}}
+									</view>
+								</view>
+								<!-- <view class="box-grow-0 font-gray mr-12">共{{mch.goods_count}}件</view> -->
+							</view>
 						<template v-if="mch.show_express_price !== false">
 							<!-- 运费信息start -->
 							<view class="dir-left-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
@@ -382,7 +396,7 @@
 						</template>
 						<!-- 欠款金额end -->
 
-						<template v-if="
+						<!-- <template v-if="
                     !(mch.order_form && mch.order_form.status == '1')
                     && mch.show_remark !== false
                     && mch.has_goods_form !== true">
@@ -392,15 +406,8 @@
 									padding-left="0" height="100"></app-input>
 							</view>
 						</template>
-						<view class="line"></view>
-						<view class="dir-right-nowrap cross-center" style="height: 84rpx; padding: 0 32rpx;">
-							<view class="box-grow-0 dir-left-nowrap">
-								<view>小计：</view>
-								<view :class="[themeTextClass]" :style="{'color': !is_gift ? theme.color : ''}">
-									¥{{balance < 0 ? setPrice(mch.total_price, balance) : FlorPrice(mch.total_price)}}
-								</view>
-							</view>
-							<view class="box-grow-0 font-gray mr-12">共{{mch.goods_count}}件</view>
+						<view class="line"></view> -->
+						
 						</view>
 					</view><!-- 循环商户列表end -->
 				</template>
@@ -856,7 +863,6 @@
 				}
 			},
 			loadPreviewData() {
-				console.log(2222222222222223333333333333)
 				this.loadingPreviewData = true;
 				uni.showLoading({
 					mask: true,
@@ -1658,7 +1664,7 @@
 		}
 
 		.submit-btn {
-			width: 240upx;
+			width: 335rpx;
 			text-align: center;
 			// border-radius: 41upx;
 		}
@@ -1693,7 +1699,7 @@
 	.bd-bottom {
 		width: 750upx;
 		height: 110upx;
-		padding: 14upx 24upx;
+		padding: 0 24upx;
 	}
 
 	.full-tip {

src/pages/sale/cusmter/list.vue

@@ -26,7 +26,7 @@
 				<image style="width: 13rpx;height: 21rpx;"
 					src="https://t17.9026.com/web/statics/image/sale/arrow_right.png" mode=""></image>
 			</view>
-			<view class="no-more" v-if="noMore">没有更多了...</view>
+			<view class="no-more" v-if="noMore && dataList.length>0">没有更多了...</view>
 			<view style="height: 200rpx;"></view>
 			<app-no-goods v-if="dataList.length === 0" :title="'暂无数据'" background="#f7f7f7"></app-no-goods>
 		</view>

src/pages/sale/mySaleOrder.vue

@@ -3,10 +3,12 @@
 	<app-layout >
 	<view class="page">
 		<!-- <view style="background-color: #fff;position: fixed;top: 0;width: 100%;"> -->
-		<view class="main-left cross-center search">
-			<image src="https://t17.9026.com/web/statics/image/index/search.png" mode=""></image>
-			<input style="width: 560rpx;" type="text" value="" placeholder="搜索客户、商品、时间、订单号" v-model="keyword"
-				placeholder-style="font-size:28rpx;color:#999;" />
+		<view style="background-color: #fff;">
+			<view class="main-left cross-center search">
+				<image src="https://t17.9026.com/web/statics/image/index/search.png" mode=""></image>
+				<input style="width: 560rpx;" type="text" value="" placeholder="搜索客户、商品、时间、订单号" v-model="keyword"
+					placeholder-style="font-size:28rpx;color:#999;" />
+			</view>
 		</view>
 		<view style="background-color: #fff;position: sticky;top: 0;width: 100%;">
 			<AppDropdownMenu :size="28" :selectedColor="getTheme.color" :checkboxColor="getTheme.color"
@@ -46,7 +48,7 @@
 						客户楼盘绑定通知
 					</view> -->
 					<view class="main-between cross-center">
-						<view class="date">交易成功</view>
+						<view class="date">{{item.status_text}}</view>
 						<image class="del" src="https://t17.9026.com/web/statics/image/user-center/del.png" mode="">
 						</image>
 					</view>
@@ -96,8 +98,8 @@
 					</template> -->
 				</view>
 			</view>
-			<view class="no-more" v-if="isNoMore">没有更多了...</view>
-			<app-no-goods v-if="dataList.length===0" :title="'暂无数据'" background="#f7f7f7"></app-no-goods>
+			<view class="no-more" v-if="isNoMore && dataList.length>0">没有更多了...</view>
+			<app-no-goods v-if="dataList.length===0" :title="`暂无订单`" background="#f7f7f7"></app-no-goods>
 		</view>
 		<template>
 			<view class="safe-area-inset-bottom">
@@ -128,17 +130,28 @@
 			return {
 				dataList:[{}],
 				options: [
-					[{
-						text: '订单状态',
-						value: 1,
-						checked: true
-					}, {
-						text: '交易成功',
-						value: 2
-					}, {
-						text: '交易失败',
-						value: 3
-					}],
+					[
+						{
+							text: '订单状态',
+							value: 0,
+							checked: true
+						}, {
+							text: '全部',
+							value: 0
+						}, {
+							text: '待付款',
+							value: 1
+						},{
+							text: '待发货',
+							value: 2
+						},{
+							text: '待收货',
+							value: 3
+						},{
+							text: '已完成',
+							value: 4
+						},
+					],
 					[{
 						text: '全部客户',
 						value: 1,
@@ -152,6 +165,7 @@
 					}]
 				],
 				range: '订单状态',
+				status:0,
 				range1: '全部客户',
 				selectIndex: 0,
 				rangeShow: false,
@@ -187,7 +201,7 @@
 				this.$request({
 					url:this.$api.order.list,
 					data:{
-						status: 0,
+						status: this.status,
 						keyword: this.keyword,
 						dateArr: [],
 						page: this.page,
@@ -216,9 +230,13 @@
 				this.selectIndex ? this.rangeShow1 = true : this.rangeShow = true
 			},
 			rangeItemClick(e) {
-				console.log(e)
-				this.selectIndex ? this.range1 = e.text : this.range = e.text
-
+				if(this.selectIndex){
+					this.range1 = e.text
+				}else{
+					this.range = e.text
+					this.status=e.value
+				}
+				this.getDataList()
 				this.rangeClose()
 			},
 			rangeClose() {

src/pages/sale/properties/addProperties.vue

@@ -1,4 +1,5 @@
 <template>
+	<app-layout>
 	<view style="padding-top: 20rpx;">
 		<view class="main-left cross-center search">
 			<image src="https://t17.9026.com/web/statics/image/index/search.png" mode=""></image>
@@ -18,7 +19,7 @@
 				<image class="bg" src="https://t17.9026.com/web/statics/image/sale/properties_gradual.png" mode="">
 				</image>
 			</view>
-			<view class="no-more" v-if="noMore">没有更多了...</view>
+			<view class="no-more" v-if="noMore && dataList.length>0">没有更多了...</view>
 			<app-no-goods v-if="dataList.length === 0" :title="'暂无数据'" background="#f7f7f7"></app-no-goods>
 		</view>
 		<u-popup v-model="show" mode="center" border-radius="14" @close="show = false">
@@ -41,6 +42,7 @@
 			</view>
 		</u-popup>
 	</view>
+	</app-layout>
 </template>
 
 <script>
@@ -107,6 +109,7 @@
 				},800)
 			},
 			getData(page){
+				this.$showLoading()
 				this.$request({
 					url: this.$api.sale.estate_list,
 					data: {
@@ -127,6 +130,7 @@
 							this.noMore=true
 						}
 					}
+					this.$hideLoading()
 				})
 			}
 		},

src/pages/sale/sale-user-center.vue

@@ -135,13 +135,13 @@
 						name: "我的消息",
 						open_type: "navigate",
 					},
-					{
-						icon_url: "https://t17.9026.com/web/statics/image/index/m.png",
-						key: "pintuan",
-						link_url: "",
-						name: "我的身份码",
-						open_type: "navigate",
-					},
+					// {
+					// 	icon_url: "https://t17.9026.com/web/statics/image/index/m.png",
+					// 	key: "pintuan",
+					// 	link_url: "",
+					// 	name: "我的身份码",
+					// 	open_type: "navigate",
+					// },
 					{
 						icon_url: "https://t17.9026.com/web/statics/image/index/kf.png",
 						key: "pintuan",

src/pages/search/search.vue

@@ -86,12 +86,34 @@
                             </view>
                         </view>
                     </template>
-                    <view style="background-color: #f7f7f7">
+                    <view style="background-color: #f7f7f7;padding: 0 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>
+								</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>
+							</view>
+							<view class="main-between pl" >
+								<view class="main-between-y">
+									<view class="title t-omit">{{item.name}}</view>
+									<view class="desc">已售:{{item.sale_num}}套 | {{item.collect_num}}人收藏</view>
+									<view class="price"><text>￥</text>{{item.actual_price}}</view>
+								</view>
+								<view class="cross-bottom arrow-right">
+									<image src="https://t17.9026.com/web/statics/image/index/arrow-right-gray.png" mode=""></image>
+								</view>
+							</view>
+						</view>
                         <u-ordinary-list :is-under-line-price="isListUnderlinePrice == 1 ? true : false"
                                          :reset="goodsReset" @buyProduct="buyProduct" :pagination="true" :list="newList" :theme="getTheme"
                                          :show-buy-btn="sign === 'goods' ? true : false"
                                          :is-show-attr="false"
-                                         :list-style="2"></u-ordinary-list>
+                                         :list-style="2">
+						</u-ordinary-list>
                     </view>
                 </view>
                 <view class="u-loading-list" v-if="loading">加载中...</view>
@@ -128,6 +150,7 @@ export default {
     data() {
         return {
             hotGoodsList: [],
+			CompositionList:[],
             list: [],
             isSearch: false,
             historyList: [],
@@ -355,39 +378,54 @@ export default {
             this.getSelect();
             this.reset();
         },
-        getGoodsList() {
+        async getGoodsList() {
             if (!this.keyword) return;
             if (is_loading) return;
             is_loading = true;
-            this.$request({
-                url: this.url,
-                data: {
-                    keyword: this.keyword,
-                    mch_id: this.mch_id,
-                    page: page,
-                }
-            }).then(response => {
-                is_loading = false;
-                this.isSearch = true;
-                this.loading = false;
-                let { code, data, msg } = response;
+			let compositionList=await this.$request({
+			    url: this.$api.composition.list,
+			    data: {
+			        keyword: this.keyword,
+			        // mch_id: this.mch_id,
+					limit:10,
+			        page: page,
+			    }
+			})
+			if (compositionList.code === 0) {
+			    if (page === 1) this.CompositionList = [];
+			    if (compositionList.data.list.length > 0) {
+			        this.CompositionList.push(...compositionList.data.list);
+			    } 
+			} 
+			if(compositionList.data.list.length<10){
+				let goodsList=await this.$request({
+					url: this.url,
+					data: {
+						keyword: this.keyword,
+						mch_id: this.mch_id,
+						page: page,
+					}
+				})
+                let { code, data, msg } = goodsList;
                 if (code === 0) {
-                    if (page === 1) this.list = [];
                     if (data.list.length > 0) {
                         this.list.push(...data.list);
-                        page++;
                     } else {
                         is_no_more = true;
                         if (page === 1) this.getRecommend();
                     }
-                } else {
-                    uni.showModal({
-                        content: msg
-                    })
-                }
-            }).catch(() => {
-                is_loading = false;
-            });
+                } 
+				if(code!=0 ||compositionList.code!=0){
+							   uni.showModal({
+							       content: msg
+							   })
+				}
+           }
+		   page++;
+		   is_loading = false;
+		   this.isSearch = true;
+		   this.loading = false;
+		   
         },
         setHistory() {
             let historyList = this.getHistory();
@@ -632,6 +670,45 @@ export default {
                 margin-right: #{40rpx};
             }
         }
+		//composition
+		.item{
+			width: 678rpx;
+			height: auto;
+			background: #FFFFFF;
+			border-radius: 8rpx;
+			margin:0 auto 24rpx;
+			padding: 27rpx 22rpx;
+			.img{
+				height: 420rpx;
+				border-radius: 10rpx;
+				overflow: hidden;
+			}
+			.pl{
+				margin-top: 25rpx;
+				.title{
+					width: 620rpx;
+					font-size: 32rpx;
+					font-weight: bold;
+					color: #222222;
+				}
+				.desc{
+					font-size: 22rpx;
+					font-weight: 500;
+					color: #999999;
+				}
+				.price{
+					font-size: 28rpx;
+					font-weight: 500;
+					color: #F93F3F;
+				}
+				.arrow-right{
+					image{
+						width: 15rpx;
+						height: 26rpx;
+					}
+				}
+			}
+			}
     }
     .u-loading-list {
         height: 64upx;

src/pages/user-center/evaluate/list.vue

@@ -59,7 +59,7 @@
 				</view>
 			</view>
 			<appNoData v-if="evaluateList.length==0" :title="'暂无评价'"></appNoData>
-			<view class="no-more" v-if="noMore">没有更多了...</view>
+			<view class="no-more" v-if="noMore && evaluateList.length>0">没有更多了...</view>
 		</view>
 	</app-layout>
 </template>

src/pages/user-center/user-center.vue

@@ -15,7 +15,7 @@
             <view @click="router(item.name)" class="u-foot-item main-center" v-for="(item, key) in foot_bar" :key="key">
                 <!-- <image class="u-icon" :src="item.icon_url"></image> -->
                 <view class="u-foot-info">
-                    <view class="u-foot-num">{{item.name | showNum(userInfo)}}</view>
+                    <view class="u-foot-num" style="font-weight: bold;">{{item.name | showNum(userInfo)}}</view>
                     <view>{{item.name}}</view>
                 </view>
             </view>

src/plugins/composition/components/app-add-subtract/app-add-subtract.vue

@@ -196,7 +196,7 @@
 			line-height: #{32upx};
 			height: #{32rpx};
 			width: #{68rpx};
-			font-size: #{21rpx};
+			font-size: #{24rpx};
 			margin-top: #{4rpx};
 			color: #353535;
 			text-align: center;

src/plugins/composition/components/app-bd-info/app-bd-info.vue

@@ -16,7 +16,7 @@
 					<view class="main-between">
 						<view class="main-left">
 							<view class="tag">{{info.tag}}</view>
-							<view class="tag">全款</view>
+							<!-- <view class="tag">全款</view> -->
 							<!-- <view class="tag">满200减10</view> -->
 						</view>
 					</view>
@@ -111,13 +111,13 @@
 		}
 		.tag{
 			width: auto;
-			height: 25rpx;
+			height: 28rpx;
 			border: 1rpx solid #F59922;
 			border-radius: 2rpx;
 			font-size: 20rpx;
 			font-weight: 500;
 			color: #F59922;
-			line-height: 24rpx;
+			line-height: 20rpx;
 			margin-right: 13rpx;
 			padding: 0 9rpx;
 		}

src/plugins/composition/components/app-list/app-list.vue

@@ -18,7 +18,7 @@
 						        <image class="item-good-attr-arrow" src="https://t17.9026.com/web/statics/image/index/arrow-right-A18353.png"></image>
 						    </view>
 						    <view class="item-good-attr" v-else @click="chooseAttr(goods,index)">
-						        <view class="item-good-attr-text t-omit-two">
+						        <view class="item-good-attr-text t-omit">
 									<!-- {{attr.attr_group_name}}: -->
 						            <text v-for="attr in goods.choose_attr.attr_list" :key="attr.attr_id">{{attr.attr_name}}</text>
 						        </view>
@@ -516,11 +516,12 @@
 						
 						width: 110rpx;
 						padding-right: 20rpx;
-						height: 30rpx;
+						height: 36rpx;
 						background: #EFDDC4;
 						border: 1px solid #A18353;
 						border-radius: 4rpx;
 						overflow: hidden;
+						padding: 0rpx 7rpx;
                         .item-good-attr-text {
                             line-height: #{30rpx};
                             max-height: #{62rpx};