From 923e854bd0abf94557bfad7829541abb81cac322 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Wed, 26 Apr 2023 09:38:41 +0800
Subject: [PATCH] 4/26

---
 App.vue                                       |   13 +
 components/J-skeleton/J-skeleton.vue          |  270 ++++
 components/J-skeleton/README.md               |   77 ++
 components/cart-choose/cart-choose.vue        |   36 +-
 components/goods-list/goods-list.vue          | 1148 +++++++++--------
 components/search/search.vue                  |   94 +-
 .../uni-goods-nav/uni-goods-nav.vue           |    2 +-
 components/wyb-popup/wyb-popup.vue            |    2 +-
 manifest.json                                 |    4 +-
 pages.json                                    |   14 +-
 pages/tabBar/classify/classify.css            |   34 +-
 pages/tabBar/classify/classify.vue            |  161 ++-
 pages/user/order_list/order_list.vue          |    2 +-
 .../address/addNewAddress/addNewAddress.vue   |  140 +-
 physical-merchants/address/address.vue        |   54 +-
 physical-merchants/classify/cart/cart.vue     |  119 +-
 .../classify/goods-search/goods-search.vue    |    4 +-
 .../classify/goodsDetail/goodsDetail.vue      |   12 +-
 .../classify/order/orderDetail.vue            |    4 +-
 physical-merchants/classify/order/pay.vue     |   12 +-
 .../classify/order/paymentResult.vue          |    2 +-
 .../detail-popup/detail-popup.vue             |   10 +-
 .../settleAccounts/settleAccounts.vue         |   67 +-
 uni.scss                                      |    4 +-
 .../uni-goods-nav/uni-goods-nav.vue           |    2 +-
 .../uni-number-box/uni-number-box.vue         |    4 +-
 26 files changed, 1383 insertions(+), 908 deletions(-)
 create mode 100644 components/J-skeleton/J-skeleton.vue
 create mode 100644 components/J-skeleton/README.md

diff --git a/App.vue b/App.vue
index 7448537..059f6e0 100644
--- a/App.vue
+++ b/App.vue
@@ -271,6 +271,19 @@
 		}
 		
 		
+		/* 解决小程序和app滚动条的问题 */
+		/* #ifdef MP-WEIXIN || APP-PLUS */
+			::-webkit-scrollbar{
+			    display: none;
+			}
+		/* #endif */
+		/* 解决H5 的问题 */
+		/* #ifdef H5 */
+		    uni-scroll-view .uni-scroll-view::-webkit-scrollbar {
+		    	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+			display: none
+		    }
+		/* #endif */
 		
 		
 		
diff --git a/components/J-skeleton/J-skeleton.vue b/components/J-skeleton/J-skeleton.vue
new file mode 100644
index 0000000..3eaa209
--- /dev/null
+++ b/components/J-skeleton/J-skeleton.vue
@@ -0,0 +1,270 @@
+<template>
+  <view>
+    <view v-if="loading" class="skeleton" :class="{ animate: animate,margin16:!isClassify }"  :style="{ justifyContent: flexType}">
+			<!-- 轮播图 -->
+			<view
+			  v-if="imgTitle"
+			  class="skeleton-imgTitle"
+			  style="width: 95%;border-radius: 10px;height: 100px;display: block;"
+			></view>
+			<!-- 头像图 -->
+      <view
+        v-if="showAvatar && !imgTitle"
+        class="skeleton-avatar"
+				v-for="(item, index) in nameRow"
+				:key="index"
+        :class="[avatarShape]"
+        :style="{ width: avatarSize, height: avatarSize}"
+      ></view>
+			<!-- 文字条 -->
+      <view class="skeleton-content" v-if="showTitle  && !imgTitle">
+        <view  class="skeleton-title" :style="{ width: titleWidth }"></view>
+        <view class="skeleton-rows">
+          <view
+            class="skeleton-row-item"
+            v-for="(item, index) in rowList"
+            :key="index"
+            :style="{ width: item.width }"
+          ></view>
+        </view>
+      </view>
+	  
+	 <view v-if="isClassify" 
+	  class="classify-avatar"
+	  >
+	  	<view class="top dis-flex">
+			<view class="top-con" v-for="(item,index) in [1,2,3,4,5,6,7,8,9]" :key="index">
+				<view class="img">
+				    
+				</view>
+				<view class="title"></view>
+			</view>
+	  	    
+	  	</view>
+		<view class="dis-flex boto">
+			<view class="left">
+				
+			</view>
+			<view class="right flex-1 dis-flex">
+				
+				<view class="ri-top">
+					
+				</view>
+				<view class="dis-flex ri-item">
+					<view class="skeleton-avatar "></view>
+					<view class="skeleton-rows">
+						  <view
+							class="skeleton-row-item"
+							v-for="(item, index) in rowList"
+							:key="index"
+							:style="{ width: item.width }"
+						  >
+						  </view>
+					</view>
+				</view>
+				
+			</view>
+		</view>
+	  </view>
+	  
+    </view>
+    <view v-else><slot></slot></view>
+  </view>
+</template>
+
+<script>
+const DEFAULT_ROW_WIDTH = '100%'
+const DEFAULT_LAST_ROW_WIDTH = '80%'
+
+export default {
+  props: {
+    loading: {
+      type: Boolean,
+      default: true,
+    },
+	isClassify:{
+		type: Boolean,
+		default: false,
+	},
+		imgTitle: {
+		  type: Boolean,
+		  default: false,
+		},
+		nameRow:{
+			type: Number,
+			default: 1,
+		},
+		flexType:{
+			type: String,
+			default: 'flex-start', // center	居中	√		space-between	两端对齐	√		space-around	子元素拉手分布	√		flex-start	居左		flex-end	居右
+		},
+    showAvatar: {
+      type: Boolean,
+      default: true,
+    },
+    avatarSize: {
+      type: String,
+      default: '50px',
+    },
+    avatarShape: {
+      type: String,
+      default: 'round', // square | round
+    },
+    showTitle: {
+      type: Boolean,
+      default: false,
+    },
+    titleWidth: {
+      type: String,
+      default: '40%',
+    },
+    row: {
+      type: Number,
+      default: 3,
+    },
+    animate: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    rowList() {
+      let list = []
+      for (let i = 0; i < this.row; i++) {
+        list.push({
+          width: i === this.row - 1 && i !== 0 ? DEFAULT_LAST_ROW_WIDTH : DEFAULT_ROW_WIDTH,
+		 
+        })
+      }
+      return list
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+	
+.classify-avatar{
+		height: calc(100vh - 60px);
+	}
+.boto{
+	height: calc(100% - 150rpx);
+}
+.top{
+	height: 150rpx;
+	overflow: hidden;
+	.top-con{
+		height: 100%;
+		padding: 0 15rpx;
+		text-align: center;
+		
+	}
+	.img{
+		width: 80rpx;
+		height: 80rpx;
+		padding: 2rpx;
+		margin: 0 0 10rpx;
+		background:var(--bg-color);
+		border-radius: 50% !important;
+	}
+	.title{
+		height: 16px;
+		width: 80rpx;
+		border-radius: 8px;
+		background:var(--bg-color) ;
+	}
+
+}
+
+.left{
+	width: 200rpx;
+	height: 100%;
+	background:var(--bg-color) ;
+	box-sizing: border-box;
+	margin: 0 20rpx;
+	border-radius: 8px;
+}
+.right{
+	
+	padding: 16px;
+	height: 100%;
+	
+	.ri-top{
+		
+	}
+	.ri-item{
+		
+	}
+	
+}
+/*  */
+.skeleton {
+  display: flex;
+ 
+  --bg-color: #f2f3f5;
+  --row-height: 16px;
+  --row-margin-top: 16px;
+}
+
+.margin16{
+	 margin: 16px 16px 0 16px;
+}
+
+.skeleton-imgTitle {
+  flex-wrap: wrap;
+	  background: var(--bg-color);
+		margin: 10px auto;
+	
+}
+.skeleton-avatar {
+  flex-shrink: 0;
+  background: var(--bg-color);
+  margin-right: 8px;
+}
+.skeleton-avatar.round {
+  border-radius: 50%;
+}
+
+.skeleton-content {
+  width: 100%;
+}
+
+.skeleton-title {
+  background-color: var(--bg-color);
+  height: var(--row-height);
+}
+
+.skeleton-title + .skeleton-rows {
+  margin-top: var(--row-margin-top);
+}
+
+.skeleton-rows {
+}
+
+.skeleton-row-item {
+  background-color: var(--bg-color);
+  height: var(--row-height);
+}
+.skeleton-row-item:not(:first-child) {
+  margin-top: var(--row-margin-top);
+}
+
+.skeleton.animate {
+  animation: skeleton-blink 1.2s ease-in-out infinite;
+}
+
+@keyframes skeleton-blink {
+  0% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.6;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+</style>
diff --git a/components/J-skeleton/README.md b/components/J-skeleton/README.md
new file mode 100644
index 0000000..77c64e1
--- /dev/null
+++ b/components/J-skeleton/README.md
@@ -0,0 +1,77 @@
+# skeleton
+感谢原作者 https://ext.dcloud.net.cn/plugin?id=852
+
+自己项目非常需要骨架，正好原作者发布了1.0   根据自己项目 自己修改了下。
+
+目前仅支持：
+1.轮播图
+2.分类栏
+3.头像
+4.文章条
+5.动态心情
+
+以上是根据自己项目修改的，后续再拓展，或者自己根据自己项目修改，原作者写的还是很灵活的，修改方便！
+
+
+## 属性说明
+
+|属性名|类型|默认值|说明|
+| -- | -- | --|--|
+| loading | Boolean | true | 是否显示占位图 |
+| flexType | String | flex-start | 排列方式 center	居中	√		space-between	两端对齐	√		space-around	子元素拉手分布	√		flex-start	居左		flex-end	居右 |
+| imgTitle | Boolean | false | 轮播图占位图 |
+| showAvatar | Boolean | true | 是否显示头像占位图 |
+| nameRow | Number | 1 | 显示头像圆1个 |
+| avatarSize | String | 50px | 头像站占位图大小 |
+| avatarShape | String | round | 头像形状，可选值：round, square |
+| showTitle | Boolean | true | 是否显示标题占位图 |
+| titleWidth | String | 40% | 标题占位图宽度 |
+| row | Number|  3 | 标题段落占位图行数 |
+| animate | Boolean | true | 是否开启动画 |
+
+## 使用示例
+
+```html
+<skeleton
+  :loading="loading"
+  :avatarSize="skeleton1.avatarSize"
+  :row="skeleton1.row"
+  :showTitle="skeleton1.showTitle"
+>
+  <view class="section-content">我是段落1</view>
+</skeleton>
+```
+
+```javascript
+import Skeleton from '../components/skeleton/index.vue'
+export default {
+  components: {
+    Skeleton
+  },
+  data() {
+    return {
+      loading: true,
+      skeleton1 : {
+        avatarSize: '52px',
+        row: 3,
+        showTitle: true,
+      }
+    }
+  },
+  created() {
+    this.reloadData()
+  },
+  methods: {
+    reloadData() {
+      this.loading = true
+      setTimeout(() => {
+        this.loading = false
+      }, 3000)
+    },
+  },
+}
+```
+
+## 效果图
+
+![](http://images.alisali.cn/img_20191014113211.png)
diff --git a/components/cart-choose/cart-choose.vue b/components/cart-choose/cart-choose.vue
index 0e11ea2..dfa798c 100644
--- a/components/cart-choose/cart-choose.vue
+++ b/components/cart-choose/cart-choose.vue
@@ -8,10 +8,10 @@
 					<image v-if="specificationList[chooseIndex].showImg" :src="imageUrl+specificationList[chooseIndex].showImg" @click="perImage(chooseIndex,imgList)"  class="img choose-img " mode="aspectFill"></image>
 				</view>
 				<view class="choose-price  marRight10">
-					<text class="" style="text-decoration: line-through;">原价 ￥{{specificationList[chooseIndex].originalPrice}}</text>
+					<text class="" style="text-decoration: line-through;">原价¥{{specificationList[chooseIndex].originalPrice}}</text>
 				</view>
-				<view class="choose-less-price  ">
-					<text class="">现价 ￥{{specificationList[chooseIndex].price}}</text>
+				<view class="choose-less-price fontwig6 ">
+					<text class="">现价 ¥{{specificationList[chooseIndex].price}}</text>
 				</view>
 			</view>
 			
@@ -39,7 +39,7 @@
 			<!-- 选分类 -->
 			<view class="choose-bottom marb10">
 				<!-- 类型分类 -->
-				<view class="choose-bottom-title fontwig6 font13 mart10">
+				<view class="choose-bottom-title fontwig6 font14 mart10">
 					选择规格 
 				</view>
 				<view class="choose-select">
@@ -54,9 +54,9 @@
 				</view>
 				
 				<!-- 数量分类 -->
-				<view class="choose-bottom-title paddbotm10 fontwig6 font13 mart10 choose-num">
+				<view class="choose-bottom-title  paddbotm10 fontwig6 font14  mart15 choose-num">
 					<view class="">购买数量</view> 
-					<uni-number-box style="transform: scale(0.9);" v-model="chooseNumber" :min="1" :max="specificationList[chooseIndex].stock || 9999999"  @noMoreLess="noMoreLess" @change="changeNumValue" />
+					<uni-number-box  v-model="chooseNumber" :min="1" :max="specificationList[chooseIndex].stock || 9999999"  @noMoreLess="noMoreLess" @change="changeNumValue" />
 				</view>
 			</view>
 			
@@ -119,6 +119,14 @@
 				default:{}
 			}
 		},
+		watch:{
+			specificationList:{
+				handler(n,o){
+					this.chooseNumber = 1;
+				},
+				deep:true
+			}
+		},
 		components:{
 			"uni-number-box":uniNumberBox
 		},
@@ -266,7 +274,7 @@
 	
 .choose-detail {
 	position: relative;
-	padding: 20rpx 20rpx 80rpx 20rpx;
+	padding: 20rpx 20rpx 100rpx 20rpx;
 	//选择
 	.choose-top {
 		display: flex;
@@ -286,7 +294,7 @@
 			display: inline-block;
 			height: 50rpx;
 			line-height: 50rpx;
-			padding: 10rpx;
+			padding: 10rpx 20rpx;
 			color: white;
 			background-color: #F95100;
 			border-radius: 45rpx;
@@ -357,9 +365,9 @@
 		width: calc(100% - 40rpx);
 		padding-bottom: 20rpx;
 		.choose-way{
-			height: 60rpx;
+			height: 70rpx;
 			width: 100%;
-			border-radius: 30rpx;
+			border-radius: 35rpx;
 			overflow: hidden;
 			display: flex;
 			align-items: center;
@@ -367,15 +375,15 @@
 			
 			.way{
 				width: 50%;
-				height: 60rpx;
-				line-height: 60rpx;
+				height:70rpx;
+				line-height:70rpx;
 				text-align: center;
 			}
 			
 			.way1{
 				width: 100% ;
-				height: 60rpx;
-				line-height: 60rpx;
+				height: 70rpx;
+				line-height: 70rpx;
 				text-align: center;
 			}
 			
diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
index 9e22e4b..93dd3e4 100644
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -1,99 +1,92 @@
 <template>
 	<view style="height: 100%;">
-		<!-- <scroll-view  :scroll-y="true" class="ht-auto goods-list" :scroll-top="scroll_top" @scroll="scroll_event" @scrolltolower="scroll_lower"  @scrolltoupper="scroll_upper"  lower-threshold="30"> -->
-		   
-		
-		<!-- <data-list v-if="typeList=='classify'" :showEmpty="propData.length == 0" :page="pageData.pageStart" :size="pageData.pageNum" :selectObject="selectObject" class="ht-auto goods-list" ref="list" @load="handleLoad"  @refresherrefresh="refresherrefresh"> -->
-		<scroll-view 
-			v-if="typeList=='classify'"
-			class="scroll-view goods-list"
-			:scroll-top="scrollTop"
-			:scroll-y="true"
-			:lower-threshold="lowerThreshold"
-			@scrolltolower="handleScrolltolower"
-			@touchstart="handleTouchStart"
-			@touchmove="handleTouchMove"
-			@touchend="handleTouchEnd"
-		>
+		<scroll-view v-if="typeList=='classify'" style="perspective: 1000;"  class="scroll-view goods-list" :scroll-top="scrollTop" :scroll-y="true"
+			:lower-threshold="lowerThreshold" @scrolltolower="handleScrolltolower" @touchstart="handleTouchStart"
+			@touchmove.stop.prevent="handleTouchMove" @touchend="handleTouchEnd" @touch.stop>
+			<!-- @touchmove.stop.prevent -->
 			<view class="scroll-content1" :style="[scrollContentStyle]">
 				<!-- 下拉 -->
 				<view class="pull-down-view">
-					<view class="refresh-view" >
-					<text :class="' pull-down-text icon-ymt '+(refreshStatus == 'soon'?' to-blod-down ':refreshStatus == 'sure'?' to-blod-up ':' ') " >{{ refreshText[refreshStatus] }}</text>
+					<view class="refresh-view">
+						<text
+							:class="' pull-down-text icon-ymt '+(refreshStatus == 'soon'?' to-blod-down ':refreshStatus == 'sure'?' to-blod-up ':' ') ">{{ refreshText[refreshStatus] }}</text>
 					</view>
 				</view>
-				
+
 				<view class="scroll-list">
 					<view class="right-content-actual pr bs" :style="'padding-bottom:'+paddBottom+'px;'">
 						<view v-if="(propData || null) != null && propData.length > 0" class="oh">
-							 
-							 <view v-for="(item, index) in propData" :key="index" >
-								<view  @click="goGoodsDetail(item.id)" class="goods-item bs">
-								    <image :src="imageUrl+item.listImg" mode="widthFix" class="goods-img"></image>
-								    <view class="goods-detail">
-								        <view class="goods-title">
-								            <view class="goods-text">{{item.name}}</view>
-								            <!-- <view v-if="(item.simple_desc || null) != null" class="goods-desc">{{item.simple_desc}}</view> -->
-											<view  class="goods-desc">{{item.listDescribe || ''}}</view>
+
+							<view v-for="(item, index) in propData" :key="index">
+								<view @click="goGoodsDetail(item.id)" class="goods-item bs">
+									<image :src="imageUrl+item.listImg" mode="aspectFill" class="goods-img bs"></image>
+									<view class="goods-detail">
+										<view class="goods-title">
+											<view class="goods-text">{{item.name}}</view>
+											<!-- <view v-if="(item.simple_desc || null) != null" class="goods-desc">{{item.simple_desc}}</view> -->
+											<view class="goods-desc">{{item.listDescribe || ''}}</view>
 										</view>
 										<view class="goods-item-bottom">
 											<view class="goods-price">
-											    <view class="new-price">&yen;{{item.price}}</view>
+												<view class="new-price">&yen;{{item.price}}</view>
 												<view class="old-price">&yen;{{item.originalPrice}}</view>
 											</view>
 											<view class="goods-num">
-											    <view class="icon cart cart-class" @click.stop="cartIconChoose(item.id)">
+												<view class="icon cart cart-class"
+													@click.stop="cartIconChoose(item.id)">
 												</view>
 											</view>
 										</view>
-								        
-								    </view>
-								</view> 
-							 </view>
-							 				
+
+									</view>
+								</view>
+							</view>
+
 						</view>
-					 
+
 					</view>
-					
+
 				</view>
-				
-				
-				
+
+
+
 				<!-- 空 -->
 				<view class=" empty-content" v-if="propData.length == 0">
-						
-						<text class="empty-text">{{ emptyText }}</text>
+					<image class="empty-text" mode="widthFix" :src="imagewxUrl+imgadres"></image>
+					<!-- <text class="empty-text">{{ emptyText }}</text> -->
 				</view>
-				
+
 				<!-- 底部上滑 -->
-				<view class="pull-up-view" >
-					
-					<view class="load-view" >
+				<view class="pull-up-view">
+
+					<view class="load-view">
 						<view class="loading-animation" v-if="loadStatus == 'loading'"></view>
-						<text :class="' loading-text icon-ymt '+(loadStatus == 'soon'?' to-blod-up ':loadStatus == 'sure'?' to-blod-down ':' ') " >{{ loadText[loadStatus] }}</text>
+						<text
+							:class="' loading-text icon-ymt '+(loadStatus == 'soon'?' to-blod-up ':loadStatus == 'sure'?' to-blod-down ':' ') ">{{ loadText[loadStatus] }}</text>
 					</view>
 				</view>
 			</view>
 		</scroll-view>
-			
-			
-			
-			
-			
+
+
+
+
+
 		<!--search-List	 -->
-		
-		<scroll-view v-if="typeList=='goodsSearch'" :scroll-y="true" class="ht-auto goods-list"   @scrolltolower="scroll_lower"  lower-threshold="30">	
+
+		<scroll-view v-if="typeList=='goodsSearch'" :scroll-y="true" class="ht-auto goods-list"
+			@scrolltolower="scroll_lower" lower-threshold="30">
 			<view class="right-content-actual pr bs" :style="'padding-bottom:'+paddBottom+'px;height:100%'">
 				<view v-if="(propData || null) != null && propData.length > 0" class="oh">
-					 
-					 <view v-for="(item, index) in propData" :key="index" >
-						<view  @click="goGoodsDetail(item.id)" class="goods-item bs">
-							<image :src="imageUrl+item.listImg" mode="widthFix" class="goods-img"></image>
+
+					<view v-for="(item, index) in propData" :key="index">
+						<view @click="goGoodsDetail(item.id)" class="goods-item bs">
+							<image :src="imageUrl+item.listImg" mode="aspectFill" class="goods-img bs"></image>
 							<view class="goods-detail">
 								<view class="goods-title">
 									<view class="goods-text">{{item.name}}</view>
 									<!-- <view v-if="(item.simple_desc || null) != null" class="goods-desc">{{item.simple_desc}}</view> -->
-									<view  class="goods-desc">{{item.listDescribe || ''}}</view>
+									<view class="goods-desc">{{item.listDescribe || ''}}</view>
 								</view>
 								<view class="goods-item-bottom">
 									<view class="goods-price">
@@ -105,634 +98,687 @@
 										</view>
 									</view>
 								</view>
-								
+
 							</view>
-						</view> 
-					 </view>
-					 	<noMore :bgColor="'#ffffff'"></noMore>			
+						</view>
+					</view>
+					<noMore :bgColor="'#ffffff'"></noMore>
+				</view>
+				<!-- 空 -->
+				<view class=" empty-content" v-else>
+					<image class="empty-text" mode="widthFix" :src="imagewxUrl+imgadres"></image>
+					<!-- <text class="empty-text">{{ emptyText }}</text> -->
 				</view>
-				 <!-- 空 -->
-				 <view class=" empty-content" v-else>
-						
-						<text class="empty-text">{{ emptyText }}</text>
-				 </view>
-				
+
 			</view>
-			
-			
-			
+
+
+
 		</scroll-view>
-		
-		
+
+
 		<!-- 购物车 -->
-		<view class="gouwuche " @click="goCart">
+		<view class="gouwuche " @click.prevent="goCart">
 			<!-- cartNum -->
-			<uniBadge class="uni-badge-left-margin badgeClass"   max-num="99" :text="cartNum+''" type="warning" size="small" />
-			<view class="icon cart font24px">
-				
+			<uniBadge class="uni-badge-left-margin badgeClass" max-num="99" :text="cartNum+''" type="warning"
+				size="small" />
+			<view class="icon cart font30px">
+
 			</view>
 		</view>
 		<!-- 选择类别 -->
-		<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
-		
-			<cart-choose @refreshCartNum="refreshCartNum"  :specificationList="specificationList"  @close="close"></cart-choose>
+		<wybPopup ref="popup" type="bottom" height="500" width="500" scrollY="true" radius="6" :showCloseIcon="true">
+
+			<cart-choose @refreshCartNum="refreshCartNum" :specificationList="specificationList" @close="close">
+			</cart-choose>
 		</wybPopup>
 	</view>
-	
+
 </template>
 
 <script>
 	import noMore from '@/components/no-more/no-more.vue'
 	import wybPopup from '@/components/wyb-popup/wyb-popup.vue'
 	import cartChoose from '@/components/cart-choose/cart-choose.vue'
-	import { findGoodsSkuByGoodsId,getShoppingCartList } from '@/Utils/physicalObject.js'
+	import {
+		findGoodsSkuByGoodsId,
+		getShoppingCartList
+	} from '@/Utils/physicalObject.js'
 	import uniBadge from '@/components/uni-badge/components/uni-badge/uni-badge.vue'
 	const app = getApp();
 	export default {
-		data(){		
-			return{
-				 cartNum:0,
-				imageUrl: app.globalData.imgUrl,//图片地址
-				 
-				 // start
-				 refresherThreshold:50,
-				 lowerThreshold:50,
-				 pullingDown: false, // 是否正在下拉
-				 pullDownHeight: 0, // 下拉高度
-				 pullDownTimeStamp: 0, // 下拉时的时间戳
-				 
-				 pullingUp: false, // 是否正在上拉
-				 pullUpHeight: 0, // 上拉高度
-				 pullUpTimeStamp: 0, // 上拉时的时间戳
-				 
-				 maxDistance:100,
-				 touchDirection:'top',
-				 list:[],
-				 emptyText:"暂无数据",
-				 
-				 loadStatus: 'soon',
-				 loadText: {
-				 	loading: '加载中~',
-				 	nomore: '没有更多啦~',
-				 	
-				 	soon: '上滑查看下一分类',
-				 	sure: '释放查看下一分类',
-				 },
-				 refreshStatus: 'soon',
-				 refreshText: {
-				 	soon: '下滑查看上一分类',
-				 	sure: '释放查看上一分类',
-				 	
-				 	nomore: '没有更多啦~',
-				 	refreshing: '正在刷新中~'
-				 },
-				 //end
-				 specificationList:[],
-				
+		data() {
+			return {
+				cartNum: 0,
+				imageUrl: app.globalData.imgUrl, //图片地址
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'goods_default_pages.png',
+				// start
+				refresherThreshold: 50,
+				lowerThreshold: 50,
+				pullingDown: false, // 是否正在下拉
+				pullDownHeight: 0, // 下拉高度
+				pullDownTimeStamp: 0, // 下拉时的时间戳
+
+				pullingUp: false, // 是否正在上拉
+				pullUpHeight: 0, // 上拉高度
+				pullUpTimeStamp: 0, // 上拉时的时间戳
+
+				maxDistance: 100,
+				touchDirection: '',
+				list: [],
+				emptyText: "暂无数据",
+
+				loadStatus: 'soon',
+				loadText: {
+					loading: '加载中~',
+					nomore: '',
+
+					soon: '上滑查看下一分类',
+					sure: '释放查看下一分类',
+				},
+				refreshStatus: 'soon',
+				refreshText: {
+					soon: '下滑查看上一分类',
+					sure: '释放查看上一分类',
+
+					nomore: '没有更多啦~',
+					refreshing: '正在刷新中~'
+				},
+				//end
+				specificationList: [],
+
 			}
-			
+
 		},
-		created(){
+		created() {
 			this.refreshCartNum();
+
+		},
+		mounted() {
+			this.handleInit();
+			
+			
 			
 		},
-		
 		props: {
 			propData: {
 				type: Array,
 				default: null
 			},
-			paddBottom:{
-				type:Number,
-				default:0,
+			paddBottom: {
+				type: Number,
+				default: 0,
 			},
-			pageData:{
-				type:Object,
-				default:{
-					pageStart:1,
-					pageNum:0,
-					allData:0
+			pageData: {
+				type: Object,
+				default: {
+					pageStart: 1,
+					pageNum: 0,
+					allData: 0
 				}
 			},
-			selectObject:{
-				type:Object,
-				default:{
-					selectIndex:0,
-					length:0
+			selectObject: {
+				type: Object,
+				default: {
+					selectIndex: 0,
+					length: 0
 				}
 			},
-			typeList:{
-				type:String,
-				default:"classify"
+			typeList: {
+				type: String,
+				default: "classify"
 			}
-			
+
 		},
-		watch:{
-			selectObject:{
+		watch: {
+			selectObject: {
 				handler(n, o) {
-					if(n.selectIndex == n.length-1){
+					if (n.selectIndex == n.length - 1) {
 						this.loadStatus = "nomore"
-					}else{
+					} else {
 						this.loadStatus = "soon"
 					}
-					if(n.selectIndex == 0){
+					if (n.selectIndex == 0) {
 						this.refreshStatus = "nomore"
-					}else{
+					} else {
 						this.refreshStatus = "soon"
 					}
-					
+
 				},
-				deep:true, // 深度监听
-				immediate:true, // 初始化监听
+				deep: true, // 深度监听
+				immediate: true, // 初始化监听
 			},
-			
+
 		},
 		computed: {
 			scrollContentStyle() {
 				const style = {};
-				const { pullDownHeight, pullingDown,pullUpHeight, pullingUp } = this;					
-				style.transform = pullingDown ? `translateY(${pullDownHeight}px)` : `translateY(0px)`;
-				style.transition = pullingDown ? `transform .1s linear` : `transform 0.3s cubic-bezier(0.19,1.64,0.42,0.72)`;
+				const {
+					pullDownHeight,
+					pullingDown,
+					pullUpHeight,
+					pullingUp
+				} = this;
+				style.transform = pullingDown&&!pullingUp ? `translateY(${pullDownHeight}px)` : `translateY(0px)`;
+				style.transition = pullingDown&&!pullingUp ? `transform .1s linear` :
+					`transform 0.3s cubic-bezier(0.19,1.64,0.42,0.72)`;
 				return style;
 			},
-			
+
 		},
-		
-		components:{
+
+		components: {
 			wybPopup,
 			cartChoose,
 			noMore,
 			uniBadge
-			
+
 		},
-		
-		methods:{
-			goCart(){
+
+		methods: {
+
+			
+			goCart() {
 				uni.navigateTo({
-					url:"/physical-merchants/classify/cart/cart"
+					url: "/physical-merchants/classify/cart/cart"
 				})
 			},
 			// 刷新购物车数量
-			refreshCartNum(){
-				getShoppingCartList().then( res=>{
+			refreshCartNum() {
+				getShoppingCartList().then(res => {
 					if (res.return_code == '000000') {
-						this.cartNum  = res.return_data.length;
-					}else{
+						this.cartNum = res.return_data.length;
+					} else {
 						uni.showToast({
 							title: res.return_msg,
 							icon: 'none',
 							duration: 2000
 						})
 					}
-				})	
+				})
 			},
-			
+
 			//查看商品详情
 			goGoodsDetail(id) {
 				uni.navigateTo({
-					 url: '/physical-merchants/classify/goodsDetail/goodsDetail?goodsId=' + id
-			
+					url: '/physical-merchants/classify/goodsDetail/goodsDetail?goodsId=' + id
+
 				})
 			},
 			// 购物车商品图标点击
-			cartIconChoose(id){
+			cartIconChoose(id) {
 				this.specificationList = [];
-				let params={
-					goodsId:id
+				let params = {
+					goodsId: id
 				};
 				console.log(params)
-				findGoodsSkuByGoodsId(params).then(res=>{
-					
+				findGoodsSkuByGoodsId(params).then(res => {
+
 					if (res.return_code == '000000') {
-						if(res.return_data&&res.return_data.length>0){
+						if (res.return_data && res.return_data.length > 0) {
 							this.specificationList = res.return_data;
 							this.$refs.popup.show();
-						}else{
+						} else {
 							this.specificationList = [];
 						}
-						
-					}else{
+
+					} else {
 						uni.showToast({
 							title: res.return_msg,
 							icon: 'none',
 							duration: 2000
 						})
 					}
-					
-					
+
+
 				})
-				
-				
+
+
 			},
 			//popup关闭选择方法
-			close(){
+			close() {
 				this.$refs.popup.hide();
 			},
-			scroll_lower(){
+			scroll_lower() {
 				this.$emit("loadData")
 			},
-			
-			
+
+
 			//start
-			 // 下滑触底后 数据加载
-			 loadData() {
-			 	this.waiting = true;
-			 	
-			 	this.$emit('loadData',res => {
-			 		this.waiting = false;
-			 		this.list = res.list;
-			 		this.total = res.total;
-			 		this.currentPage++;
-			 		this.handleComputeData();
-			 		// this.computedHeight();
-			 	});
-			 },
-			 
-			 // 计算高度
-			 // computedHeight() {
-			 	
-			 // },
-			 // 计算数据
-			 handleComputeData() {
-			 	const len = this.list.length;
-			 	const total = this.total;
-			 	// console.log(len,total)
-			 	 if (len >= this.total) {
-			 		this.loadStatus = 'soon';
-			 	} else if (len < this.total) {
-			 		this.loadStatus = 'loading';
-			 	}
-			 },
-			 // 下滑触底事件
-			 handleScrolltolower(e) {
-			 	this.$emit('scrolltolower', e);
-			 	if (this.loadStatus == 'nomore' || this.waiting) return;
-			 	this.loadData();
-			 },
-			 // 滚动事件
-			 handleScroll(e) {
-			 	// this.currentScrollTop = e.detail.scrollTop;
-			 	
-			 	// if (e.detail.scrollTop <= 20) {
-			 	// 	this.touchDirection = 'top';
-			 	// } else {
-			 	// 	this.touchDirection = 'bottom';
-			 	// } 
-			 	// console.log(e.detail.scrollTop)
-			 	this.$emit('scroll', e);
-			 },
-			 // 触摸按下处理
-			 handleTouchStart(e) {
-			 	this.pullingDown = true;
-			 	this.currentTouchStartY = e.touches[0].clientY;
-			 },
-			 // 触摸按下滑动处理
-			 handleTouchMove(e) {
-			 	// 顶部下滑
-			 	if (e.touches[0].clientY >= this.currentTouchStartY){
-			 		this.touchDirection = 'top';
-			 		const currentTouchMoveY = e.touches[0].clientY;
-			 		let movingDistance = (currentTouchMoveY - this.currentTouchStartY) ;
-			 		if(this.selectObject.selectIndex == 0){
-			 			this.refreshStatus = 'nomore'
-			 		}
-			 		else if(movingDistance > this.refresherThreshold){
-			 			this.refreshStatus = 'sure';// 释放
-			 		}else{
-			 			this.refreshStatus = 'soon';// 划
-			 		}
-			 		let computeDistance = movingDistance;
-			 		if(computeDistance > this.maxDistance){
-			 			computeDistance = this.maxDistance;
-			 		}
-			 		this.pullDownHeight = computeDistance ;
-			 	}else{
-			 		// 底部上滑
-			 		this.touchDirection = 'bottom';
-			 		const currentTouchMoveY = e.touches[0].clientY;
-			 		let movingDistance = (this.currentTouchStartY - currentTouchMoveY ) ;
-			 		if(this.selectObject.selectIndex == this.selectObject.length-1){
-			 			this.loadStatus = 'nomore';
-			 		}else if (movingDistance >= this.lowerThreshold) {
-			 			this.loadStatus = 'sure';//释放
-			 		
-			 		} else {
-			 			this.loadStatus = 'soon';//划
-			 			
-			 		}
-			 		let computeDistance = movingDistance;
-			 		if(computeDistance > this.maxDistance){
-			 			computeDistance = this.maxDistance;
-			 		}
-			 		this.pullUpHeight = computeDistance;
-			 				
-			 	}
-			 	
-			 },
-			 // 触摸松开处理
-			 handleTouchEnd(e) {		
-			 	// 顶部下滑
-			 	if(this.touchDirection == 'top'){				
-			 		if(this.pullDownHeight>=this.refresherThreshold&&this.selectObject.selectIndex > 0){
-						this.$emit("switchCategory","prev")
-			 		}
-			 		this.pullingDown = false;
-			 		this.pullDownHeight = 0;
-			 	// 底部上滑
-			 	}else if(this.touchDirection == 'bottom'){
-			 		if(this.pullUpHeight>=this.lowerThreshold&&this.selectObject.selectIndex < (this.selectObject.length-1)){
-						this.$emit("switchCategory","next")	
-			 		}
-			 		this.pullingUp = false;
-			 		this.pullUpHeight = 0;	
-			 	}
-			 },
-			 // 初始化
-			 handleInit() {
-			 	this.currentPage = this.page;
-			 	this.currentSize = this.size;
-			 	// console.log()
-			 	// this.computedHeight();
-			 },
-			 
-			 
-			 // end
-			
-			
-			
+			// 下滑触底后 数据加载
+			loadData() {
+				this.waiting = true;
+
+				this.$emit('loadData', res => {
+					this.waiting = false;
+					this.list = res.list;
+					this.total = res.total;
+					this.currentPage++;
+					this.handleComputeData();
+
+				});
+			},
+			// 计算数据
+			handleComputeData() {
+				const len = this.list.length;
+				const total = this.total;
+				if (len >= this.total) {
+					this.loadStatus = 'soon';
+				} else if (len < this.total) {
+					this.loadStatus = 'loading';
+				}
+			},
+			// 下滑触底事件
+			handleScrolltolower(e) {
+				this.$emit('scrolltolower', e);
+				if (this.loadStatus == 'nomore' || this.waiting) return;
+				this.loadData();
+			},
+			// 滚动事件
+			handleScroll(e) {
+				this.currentScrollTop = e.detail.scrollTop;
+
+				// if(this.currentScrollTop<5){
+				// 	this.isTop=true;
+				// }
+
+				this.$emit('scroll', e);
+			},
+			// 触摸按下处理
+			handleTouchStart(e) {
+				this.pullingDown = true;
+				this.currentTouchStartY = e.touches[0].clientY;
+			},
+			// 触摸按下滑动处理
+			handleTouchMove(e) {
+				// 顶部下滑
+				if (e.touches[0].clientY >= this.currentTouchStartY) {
+					this.pullingUp = false;
+					this.touchDirection = 'top';
+					const currentTouchMoveY = e.touches[0].clientY;
+					let movingDistance = (currentTouchMoveY - this.currentTouchStartY);
+					if (this.selectObject.selectIndex == 0) {
+						this.refreshStatus = 'nomore'
+					} else if (movingDistance > this.refresherThreshold) {
+						this.refreshStatus = 'sure'; // 释放
+					} else {
+						this.refreshStatus = 'soon'; // 划
+					}
+					let computeDistance = movingDistance;
+					if (computeDistance > this.maxDistance) {
+						computeDistance = this.maxDistance;
+					}
+					this.pullDownHeight = computeDistance;
+				} else {
+					this.pullingUp = true;
+					this.pullingDown = false;
+					// 底部上滑
+					this.touchDirection = 'bottom';
+					const currentTouchMoveY = e.touches[0].clientY;
+					let movingDistance = (this.currentTouchStartY - currentTouchMoveY);
+					if (this.selectObject.selectIndex == this.selectObject.length - 1) {
+						this.loadStatus = 'nomore';
+					} else if (movingDistance >= this.lowerThreshold) {
+						this.loadStatus = 'sure'; //释放
+
+					} else {
+						this.loadStatus = 'soon'; //划
+
+					}
+					let computeDistance = movingDistance;
+					if (computeDistance > this.maxDistance) {
+						computeDistance = this.maxDistance;
+					}
+					this.pullUpHeight = computeDistance;
+
+				}
+
+			},
+			// 触摸松开处理
+			handleTouchEnd(e) {
+
+
+				// 顶部下滑
+				if (this.touchDirection == 'top') {
+					if (this.pullDownHeight >= this.refresherThreshold && this.selectObject.selectIndex > 0) {
+						this.$emit("switchCategory", "prev")
+					}
+
+					// 底部上滑
+				} else if (this.touchDirection == 'bottom') {
+					if (this.pullUpHeight >= this.lowerThreshold && this.selectObject.selectIndex < (this.selectObject
+							.length - 1)) {
+						this.$emit("switchCategory", "next")
+					}
+
+				}
+				this.pullDownHeight = 0;
+				this.pullUpHeight = 0;
+				this.pullingDown = false;
+				this.pullingUp = false;
+
+
+
+
+			},
+			// 初始化
+			handleInit() {
+				this.currentPage = this.page;
+				this.currentSize = this.size;
+				// console.log()
+				// this.computedHeight();
+			},
+
+
+			// end
+
+
+
 		}
-		
+
 	}
 </script>
 
-<style lang="scss"  scoped>
+<style lang="scss" scoped>
 	// 购物车
-.gouwuche {
-	position: absolute;
-	bottom: 10px;
-	right: 15px;
-	width: 25px;
-	height: 25px;
-	color: #3DA7E7 !important;
-		
-}
-.badgeClass {
+	.gouwuche {
+		position: absolute;
+		bottom: 10px;
+		right: 25px;
+		width: 30px;
+		height: 30px;
+		color: #3DA7E7 !important;
+
+	}
+
+	.badgeClass {
 		position: absolute;
-		top:-5px;
+		top: -5px;
 		right: -10px;
-}
-.font24px{
-	font-size: 24px !important;
-	color: #F0AD4E;
-}
+	}
+
+	.font30px {
+		font-size: 30px !important;
+		color: #F0AD4E;
+	}
 
 	// 
-.br {
-    border: 1px solid #ffffff ;
-}
-.bs {
-    box-sizing: border-box;
-}
-.goods-list .goods-item{
-	
-	display: flex;
-	align-items: center;
-	 width: 100%;
-	height: 240rpx;
-	/* margin-bottom: 20rpx; */
-	color: #333333;
-	padding:  0 20rpx 10rpx;
-	border-bottom: 1px solid #F6F6F6;
-	
-}
-
-.goods-list{
-	background-color: #ffffff;
-}
-
-.goods-list .goods-img {
-    /* width: 190rpx; */
-    height: 160rpx !important;
-	width: 160rpx;
-	padding: 10rpx;
-}
-
-.goods-list .goods-detail {
-	width: calc(100% - 190rpx);
-	height: 100%;
-	
-}
-
-.goods-title {
-	width: 100%;
-	padding: 0 10rpx 0 0;
-	height: 140rpx;
-	
-}
-.goods-title .goods-text {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	height: 50rpx;
-	line-height: 50rpx;
-	font-size: 30rpx;
-	padding: 20rpx 0 10rpx;
-}
-.goods-title .goods-desc {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	height: 40rpx;
-	line-height: 40rpx;
-	font-size: 24rpx;
-	color: #999999;
-}
-
-.goods-item-bottom{
-	display: flex;
-	justify-content: space-between;
-	align-items: flex-end;
-}
-.goods-item-bottom .goods-price{
-	font-family: Arial;
-	padding-left: 20rpx;
-}
-.goods-item-bottom .new-price{
-	color: #3DA7E7;
-	font-weight: bold;
-}
-
-.goods-item-bottom .old-price{
-	font-size: 24rpx;
-	color: #D6D6D6;
-	font-weight: bold;
-	text-decoration:line-through;
-}
-.goods-item-bottom .goods-num{
-	height: 80rpx;
-}
-.goods-item-bottom .cart-class{
-	width: 80rpx;
-	height: 80rpx;
-	line-height: 80rpx;
-	color: #3DA7E7;
-	text-align: center;
-	font-size: 40rpx;
-	
-}
-
-/* gundong */
-// 空
-.empty-content {
-	height:calc(100% - 20px) ;
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-	justify-content: center;
-	.empty-image {
-		width: 100%;
+	.br {
+		border: 1px solid #ffffff;
 	}
-	.empty-text {
-		
-		display: block;
-		color: #606266;
-		margin-top: 20rpx;
+
+	.bs {
+		box-sizing: border-box;
 	}
-}
 
-.scroll-view {
-	height: 100%;
-	
-	.scroll-content1{
+	.goods-list .goods-item {
+
+		display: flex;
+		align-items: center;
 		width: 100%;
+		height: 240rpx;
+		/* margin-bottom: 20rpx; */
+		color: #333333;
+		padding: 0 20rpx 10rpx;
+		border-bottom: 1px solid #F6F6F6;
+
+	}
+
+	.goods-list {
+		background-color: #ffffff;
+	}
+
+	.goods-list .goods-img {
+		/* width: 190rpx; */
+		height: 100% !important;
+		width: 200rpx;
+		padding: 10rpx;
+	}
+
+	.goods-list .goods-detail {
+		width: calc(100% - 190rpx);
 		height: 100%;
-		position: relative;
-		.empty-view {
+
+	}
+
+	.goods-title {
+		width: 100%;
+		padding: 0 10rpx 0 0;
+		height: 140rpx;
+
+	}
+
+	.goods-title .goods-text {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		height: 50rpx;
+		line-height: 50rpx;
+		font-size: 30rpx;
+		padding: 20rpx 0 10rpx;
+	}
+
+	.goods-title .goods-desc {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		height: 40rpx;
+		line-height: 40rpx;
+		font-size: 24rpx;
+		color: #999999;
+	}
+
+	.goods-item-bottom {
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-end;
+	}
+
+	.goods-item-bottom .goods-price {
+		font-family: Arial;
+		padding-left: 20rpx;
+	}
+
+	.goods-item-bottom .new-price {
+		color: #3DA7E7;
+		font-weight: bold;
+	}
+
+	.goods-item-bottom .old-price {
+		font-size: 24rpx;
+		color: #D6D6D6;
+		font-weight: bold;
+		text-decoration: line-through;
+	}
+
+	.goods-item-bottom .goods-num {
+		height: 80rpx;
+	}
+
+	.goods-item-bottom .cart-class {
+		width: 80rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		color: #3DA7E7;
+		text-align: center;
+		font-size: 40rpx;
+
+	}
+
+	/* gundong */
+	// 空
+	.empty-content {
+		height: calc(100% - 20px);
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		justify-content: center;
+
+		.empty-image {
 			width: 100%;
-			height: 100%;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			
 		}
-		
-		.pull-down-view {
-			top: 0;
-			left: 0;
+
+		.empty-text {
+			width: 80%;
+			display: block;
+			color: #606266;
+			margin-top: 40rpx;
+			margin-bottom: 20rpx;
+		}
+	}
+
+	.scroll-view {
+		height: 100%;
+
+		.scroll-content1 {
 			width: 100%;
-			padding: 30rpx 0;
-			display: flex;
-			position: absolute;
-			align-items: center;
-			flex-direction: column;
-			justify-content: center;
-			transform: translateY(-100%);
-			.refresh-view {
+			// position: relative;
+			// height: inherit;
+			.empty-view {
+				width: 100%;
+				height: 100%;
 				display: flex;
 				align-items: center;
+				justify-content: center;
+
+			}
+
+			.pull-down-view {
+				width: 100%;
+				top: 0;
+				left: 0;
+				padding: 30rpx 0;
+				display: flex;
+				position: absolute;
+				align-items: center;
 				flex-direction: column;
-				.loading-animation {
-					width: 50rpx;
-					height: 50rpx;
-				}
-				.pull-down-text {
-					color: #606266;
-					font-size: 24rpx;
-					margin-top: 10rpx;
+				justify-content: center;
+				transform: translateY(-100%);
+
+				.refresh-view {
+					display: flex;
+					align-items: center;
+					flex-direction: column;
+
+					.loading-animation {
+						width: 50rpx;
+						height: 50rpx;
+					}
+
+					.pull-down-text {
+						color: #606266;
+						font-size: 24rpx;
+						margin-top: 10rpx;
+					}
 				}
 			}
-		}
-		.scroll-list {
-			display: flex;
-			flex-direction: column;
-		}
-		.loading-view {
-			width: 100%;
-			height: 100%;
-			display: flex;
-			align-items: center;
-			flex-direction: column;
-			justify-content: center;
-			.loading-animation {
-				width: 40rpx;
-				height: 40rpx;
-			}
-			.loading-text {
-				color: #606266;
-				font-size: 24rpx;
-				margin-top: 10rpx;
+
+			.scroll-list {
+				display: flex;
+				flex-direction: column;
 			}
-		}
-		.pull-up-view {
-			width: 100%;
-			// padding: 15rpx 0;
-			height: 20px;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			.load-view {
+
+			.loading-view {
+				width: 100%;
+				height: 100%;
 				display: flex;
 				align-items: center;
+				flex-direction: column;
+				justify-content: center;
+
+				.loading-animation {
+					width: 40rpx;
+					height: 40rpx;
+				}
+
 				.loading-text {
 					color: #606266;
 					font-size: 24rpx;
-					margin-left: 20rpx;
+					margin-top: 10rpx;
 				}
 			}
-		}
-		.loading-animation {
-			position: relative;
-			&::after,
-			&::before {
-				left: 0;
+
+			.pull-up-view {
 				width: 100%;
-				position: absolute;
-				border: 0 solid currentColor;
-				background-color: #b7b7b7;
-			}
-			&::after {
-				content: '';
-				top: -25%;
-				z-index: 1;
-				height: 100%;
-				border-radius: 10%;
-				animation: spin 0.6s -0.1s linear infinite;
-			}
-			&::before {
-				content: '';
-				bottom: -9%;
-				height: 10%;
-				background: #000;
-				border-radius: 50%;
-				opacity: 0.2;
-				animation: shadow 0.6s -0.1s linear infinite;
-			}
-			@keyframes spin {
-				17% {
-					border-bottom-right-radius: 10%;
+				// padding: 15rpx 0;
+				height: 20px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.load-view {
+					display: flex;
+					align-items: center;
+
+					.loading-text {
+						color: #606266;
+						font-size: 24rpx;
+						margin-left: 20rpx;
+					}
 				}
-				25% {
-					transform: translateY(25%) rotate(22.5deg);
+			}
+
+			.loading-animation {
+				position: relative;
+
+				&::after,
+				&::before {
+					left: 0;
+					width: 100%;
+					position: absolute;
+					border: 0 solid currentColor;
+					background-color: #b7b7b7;
 				}
-				50% {
-					border-bottom-right-radius: 100%;
-					transform: translateY(50%) scale(1, 0.9) rotate(45deg);
+
+				&::after {
+					content: '';
+					top: -25%;
+					z-index: 1;
+					height: 100%;
+					border-radius: 10%;
+					animation: spin 0.6s -0.1s linear infinite;
 				}
-				75% {
-					transform: translateY(25%) rotate(67.5deg);
+
+				&::before {
+					content: '';
+					bottom: -9%;
+					height: 10%;
+					background: #000;
+					border-radius: 50%;
+					opacity: 0.2;
+					animation: shadow 0.6s -0.1s linear infinite;
 				}
-				100% {
-					transform: translateY(0) rotate(90deg);
+
+				@keyframes spin {
+					17% {
+						border-bottom-right-radius: 10%;
+					}
+
+					25% {
+						transform: translateY(25%) rotate(22.5deg);
+					}
+
+					50% {
+						border-bottom-right-radius: 100%;
+						transform: translateY(50%) scale(1, 0.9) rotate(45deg);
+					}
+
+					75% {
+						transform: translateY(25%) rotate(67.5deg);
+					}
+
+					100% {
+						transform: translateY(0) rotate(90deg);
+					}
 				}
-			}
-			@keyframes shadow {
-				50% {
-					transform: scale(1.25, 1);
+
+				@keyframes shadow {
+					50% {
+						transform: scale(1.25, 1);
+					}
 				}
 			}
 		}
 	}
-}
-
-
-</style>
\ No newline at end of file
+</style>
diff --git a/components/search/search.vue b/components/search/search.vue
index 2fd5aeb..e42c7fc 100644
--- a/components/search/search.vue
+++ b/components/search/search.vue
@@ -1,12 +1,11 @@
 <template>
     <view>
         <view class="search-content pr">
-            <view class="search-icon  pa" @tap="search_input_event">								
-                <!-- <uni-icons :type="propIcon" size="12" :color="propIconColor"></uni-icons> -->
+            <view class="search-icon  pa" @click="search_input_event">								
 				<view class="search icon icon-color icon-font"></view>
 			</view>
 			
-            <input type="text" confirm-type="search" class="round " :placeholder="propPlaceholder" :placeholder-class="propPlaceholderClass" v-model="keywords" @confirm="search_input_event" :style="'color:'+propTextColor+';background:'+propBgColor+';'+((propBrColor || null) != null ? 'border:1px solid '+propBrColor+';' : '')">
+            <input type="text" :disabled="disableInput" confirm-type="search" class="round " :placeholder="propPlaceholder" :placeholder-class="propPlaceholderClass" v-model="keywords" @confirm="search_input_event" style="color:#666;background:#ffffff;">
         </view>
     </view>
 </template>
@@ -21,14 +20,6 @@
         },
         components: {},
         props: {
-            propUrl: {
-            	type: String,
-            	default: '/pages/goods-search/goods-search'
-            },
-            propFormName: {
-            	type: String,
-            	default: 'keywords'
-            },
             propPlaceholder: {
             	type: String,
             	default: '输入商品名称搜索'
@@ -37,41 +28,28 @@
             	type: String,
             	default: 'cr-grey'
             },
-            propTextColor: {
-            	type: String,
-            	default: '#666'
-            },
-            propBgColor: {
-            	type: String,
-            	default: '#FFFFFF'
-            },
-            propBrColor: {
-            	type: String,
-            	default: ''
-            },
             propIsRequired: {
             	type: Boolean,
             	default: true
             },
-            propIsOnEvent: {
-            	type: Boolean,
-            	default: false
-            },
-            // propIcon: {
-            // 	type: String,
-            // 	default: 'search'
-            // },
-            propIsIconOnEvent: {
-            	type: Boolean,
-            	default: false
-            },
+			disableInput:{
+				type: Boolean,
+				default: false
+			}
+            
         },
+		// watch:{
+		// 	propKeyWords:{
+		// 		handler(n,o){
+		// 			this.keywords = n;
+		// 		},
+		// 		immediate:true 
+		// 	}
+		// },
         methods: {
             // 搜索事件
             search_input_event() {
 				
-                // var keywords = e.detail.value || null;
-				// console.log(this.keywords)
 				this.keywords = this.keywords || null;
                 // 是否验证必须要传值
                 if (this.propIsRequired && this.keywords == null) {		
@@ -82,29 +60,23 @@
 					});
                     return false;
                 }
-                
-                // 是否回调事件
-                // if(this.propIsOnEvent) {
-                    this.$emit('onsearch', this.keywords);//回调
-                // } else {
-                //     // 进入搜索页面
-                //     uni.navigateTo({
-                //         url: this.propUrl+'?'+this.propFormName+'=' + keywords
-                //     });
-                // }
+                this.$emit('onsearch', this.keywords);//回调
             },
             
-            // icon事件
-            // search_icon_event(e) {
-            //     // 是否回调事件
-            //     if(this.propIsIconOnEvent) {
-            //         this.$emit('onicon', {});
-            //     }
-            // }
-        }
+        },
+		destroyed() {
+			this.keywords = ""
+		}
     };
 </script>
 <style>
+	
+	.cr-grey{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+	
 	.round{
 		border-radius: 50rpx ;
 	}
@@ -121,8 +93,8 @@
 	
     .search-content .search-icon {
         text-align: center;
-		height: 30px;
-		line-height: 30px;
+		height: 40px;
+		line-height: 40px;
 		width: 30px;
 		
     } 
@@ -135,11 +107,11 @@
 		font-size:20px ;
 	}
 	
-    .search-content input {
-        font-size: 12px;
+    .search-content .round {
+        font-size: 16px;
         padding: 0 15px 0 30px;
         box-sizing: border-box;
-        height: 30px;
-        line-height: 30px;
+        height: 40px;
+        line-height: 40px;
     } 
 </style>
\ No newline at end of file
diff --git a/components/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue b/components/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue
index 11d74ae..05eef79 100644
--- a/components/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue
+++ b/components/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue
@@ -114,7 +114,7 @@
 
 	.uni-tab__cart-box {
 		flex: 1;
-		height: 50px;
+		height: 60px;
 		background-color: #fff;
 		z-index: 900;
 	}
diff --git a/components/wyb-popup/wyb-popup.vue b/components/wyb-popup/wyb-popup.vue
index cd51a8a..a470972 100644
--- a/components/wyb-popup/wyb-popup.vue
+++ b/components/wyb-popup/wyb-popup.vue
@@ -148,7 +148,7 @@
 						if (this.type === 'left' || this.type === 'right') {
 							return '100%'
 						} else {
-							return '400px'
+							return `${this.height}px`
 						}
 					}
 				}
diff --git a/manifest.json b/manifest.json
index 2bc71e7..9383752 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "嗨森逛",
-    "appid" : "__UNI__E807B53",
+    "appid" : "__UNI__70C9511",
     "description" : "",
     "versionName" : "1.2.1",
     "versionCode" : "100",
@@ -70,7 +70,7 @@
                 "desc" : "你的位置信息将用于小程序定位"
             }
         },
-        "requiredPrivateInfos" : [ "getLocation","chooseAddress" ]
+        "requiredPrivateInfos" : [ "getLocation", "chooseAddress" ]
     },
     "h5" : {
         "sdkConfigs" : {
diff --git a/pages.json b/pages.json
index eba1b05..8bde333 100644
--- a/pages.json
+++ b/pages.json
@@ -35,7 +35,8 @@
 				"navigationBarTitleText": "商品",
 				"navigationBarBackgroundColor": "#3da7e7",
 				"backgroundColorTop": "#3da7e7",
-				"onReachBottomDistance": 50,
+				"enablePullDownRefresh": false,
+				"disableScroll": true,
 				"app-plus": {
 					"titleNView": false, //禁用原生导航栏
 					"softinputNavBar": "none"
@@ -1095,14 +1096,17 @@
 					"navigationBarTitleText": "搜索",
 					"enablePullDownRefresh": false,
 					"navigationBarBackgroundColor": "#3da7e7",
-					"backgroundColorTop": "#3da7e7"
+					"backgroundColorTop": "#3da7e7",
+					"navigationBarTextStyle": "white"
 				}
 			},
 			{
 				"path": "classify/cart/cart",
 				"style": {
 					"navigationBarTitleText": "购物车",
-					"enablePullDownRefresh": false
+					"enablePullDownRefresh": false,
+					"disableScroll": true
+					
 				}
 			},
 			{
@@ -1131,6 +1135,10 @@
 				"style": {
 					"navigationBarTitleText": "订单确认",
 					"enablePullDownRefresh": false
+				},
+				"app-plus": {
+					// "softinputNavBar": "none",
+					"softinputMode": "adjustResize"
 				}
 			},
 			{
diff --git a/pages/tabBar/classify/classify.css b/pages/tabBar/classify/classify.css
index 8b78391..3f810db 100644
--- a/pages/tabBar/classify/classify.css
+++ b/pages/tabBar/classify/classify.css
@@ -33,6 +33,13 @@
 .bs{
 	box-sizing: border-box;
 }
+
+/* 商品comtainer */
+
+.nav-container{
+	height:calc(100% - 150rpx );
+}
+
 /**
 * 左侧导航
 */
@@ -41,7 +48,8 @@
 }
 .left-nav {
     width: 200rpx;
-	height:calc(100% - 150rpx );
+	/* height:calc(100% - 150rpx ); */
+	height:100%;
 	background-color: #F9F9F9;
 }
 
@@ -130,14 +138,11 @@
 
 .goods-right-content {
     width: calc(100% - 200rpx);
-    height: calc(100% - 150rpx);
-    top: 150rpx;
-    right: 0;
+    /* height: calc(100% - 150rpx); */
+	height: 100%;
     background: #ffffff;
-	/* padding-left: 20rpx;
-	padding-right: 20rpx; */
 	box-sizing: border-box;
-	/* overflow: auto; */
+	
 }
 .right-content-actual {
 	 height: calc(100% - 150rpx);
@@ -145,20 +150,17 @@
 }
 
 .goods-right-ms{
-	/* height: calc(100% - 60rpx); */
-	    height: 100%;
-	    padding-top: 60rpx;
+	height: calc(100% - 60rpx);
+	    
+	    /* padding-top: 60rpx; */
 		box-sizing: border-box;
 }
 
 .goods-right-content .sort-contain{
-	position: fixed;
-	/* top:150rpx; */
-	width: calc(100% - 240rpx);
-	z-index: 100;
+	/* position: fixed; */
+	width: 100%;
+	/* z-index: 100; */
 	background-color: #ffffff;
-	/* background-color: #333333; */
-	
 }
 .goods-right-content .sort-cla {
 	width: 100%;
diff --git a/pages/tabBar/classify/classify.vue b/pages/tabBar/classify/classify.vue
index 3c9eb05..29ed6b3 100644
--- a/pages/tabBar/classify/classify.vue
+++ b/pages/tabBar/classify/classify.vue
@@ -4,15 +4,24 @@
 		<!-- 搜索框 -->
 		<block >
 		    <view class="nav-search jianbian" @click="toSearch">
-		        <component-search   propPlaceholder="输入商品名称搜索"></component-search>
+		        <component-search :disableInput="true" :propIsRequired="false"  propPlaceholder="输入商品名称搜索"></component-search>
 		    </view>
 		</block>
-		<view v-if="category_list.length > 0" class="category-content pr  " :style="'height:calc(100vh - '+(50)+'px);'">
+		
+		<!-- <skeleton
+		:loading="false"
+		:isClassify="true"
+		:showAvatar="false"
+		>
+		</skeleton> -->
+		
+		<view v-if="category_list.length > 0"  class="category-content pr  " :style="'height:calc(100vh - '+(60)+'px);'">
 		<!-- 商品列表模式 -->
 		<block >
 		    <!-- 一级导航 -->
 		    <view class="top-nav  scroll-view-horizontal">
-		        <scroll-view :scroll-x="true" >
+		        
+				<scroll-view :scroll-x="true" >
 		            <block v-for="(item, index) in category_list" :key="index">
 		                <view :class="' item dis-inline-block ' + (nav_active_index == index ? 'active-class ' : '')" :data-index="index" :data-itemtwoindex="0"  @click="nav_event">
 		                    <view :class="'icon-content circle br ' + (nav_active_index == index ? 'active-border' : '')">
@@ -22,17 +31,21 @@
 		                </view>
 		            </block>
 		        </scroll-view>
+				
 		    </view>
 			
+		<view class="nav-container dis-flex">
+				
+			
 		    <!-- 二级导航 -->
 		     <view class="left-nav ">
 		        <scroll-view :scroll-y="true" :scroll-top="scrollTop" class="ht-auto">
-		            <view class="left-content-actual bs tc">
+		            <view class="left-content-actual bs tc ">
 		               
 		                <block v-if="(data_content || null) != null && (data_content.children || null) != null && data_content.children.length > 0">
 		                    <block v-for="(item, index) in data_content.children" :key="index">
-		                        <view :class="' item   ' + (nav_active_item_two_index == index ? 'active-class active-border nav-active' : '')" :data-index="nav_active_index" :data-itemtwoindex="index"  @click="nav_event">
-		                            <text>{{item.title}}</text>
+		                        <view :class="'dis-flex flex-center item   ' + (nav_active_item_two_index == index ? 'active-class active-border nav-active' : '')" :data-index="nav_active_index" :data-itemtwoindex="index"  @click="nav_event">
+		                          <image v-if="item.img" style="height: 20px;width: 20px;" :src="imageUrl+item.img" mode="aspectFit"></image>  <text class="">{{item.title || ''}}</text>
 		                        </view>
 		                    </block>
 		                </block>
@@ -40,11 +53,11 @@
 		        </scroll-view>
 		    </view> 
 		    <!-- 商品列表 -->
-		    <view class="goods-right-content pa ">
+		    <view class="goods-right-content  ">
 				<view class="sort-contain">
 					<view class="sort-cla">
 						<view :class=" 'sort '+(sortIndex == 1 ? ' sort-active ' : '') "  @click="sortEvent(1)" >综合</view>
-						<view :class=" 'sort '+(sortIndex == 2 ? ' sort-active ' : '') "  @click="sortEvent(2)">销量</view>
+						<!-- <view :class=" 'sort '+(sortIndex == 2 ? ' sort-active ' : '') "  @click="sortEvent(2)">销量</view> -->
 						<view class="sort px "  @click="sortEvent(3)">
 							<text :class=" (sortIndex == 3 ? ' sort-active ' : '') ">价格</text>
 							<view class="pri-px">
@@ -54,22 +67,34 @@
 						</view>
 					</view>
 				</view>
-				<view class="goods-right-ms">
-					<goodsList v-if="hackReset"  :propData="goodsListData" :pageData="pageData" :selectObject="selectObject" @loadData="loadData" @switchCategory="switchCategory"   :paddBottom="0" ></goodsList>
+				<view class="goods-right-ms"   >
+					<skeleton
+					:loading="isLoading"
+					:avatarSize="'200rpx'"
+					avatarShape="square"
+					:row="3"
+					:showTitle="true"
+					v-for="(item,index) in skeletonNum"
+					:key="index"
+					>
+					</skeleton>
+					<goodsList v-if="hackReset&&!isLoading"  :propData="goodsListData" :pageData="pageData" :selectObject="selectObject" @loadData="loadData" @switchCategory="switchCategory"   :paddBottom="0" ></goodsList>
+					<!-- <view class="spinner">
+						<view class="dot"></view>
+						<view class="dot"></view>
+						<view class="dot"></view>
+						<view class="dot"></view>
+						<view class="dot"></view>
+					</view> -->
 				</view>
 		        
 		    </view>
+		</view>
 		</block>
 		</view>
 		
 		
-		<!-- 购物车 -->
-		<!-- <view class="gouwuche " @click="goCart">
-			<uniBadge class="uni-badge-left-margin badgeClass"   max-num="99" :text="cartNum" type="warning" size="small" />
-			<view class="icon cart font24px">
-				
-			</view>
-		</view> -->
+		
 	</view>
 </template>
 
@@ -80,13 +105,16 @@
 	
 	import goodsList from '@/components/goods-list/goods-list.vue'
 	
+	import skeleton from '@/components/J-skeleton/J-skeleton.vue'
+	
 	import {getGoodsTypeTree,getListGoodsDetail,getShoppingCartList} from '@/Utils/physicalObject.js'
 	const app = getApp();
 	export default {
 		components: {
 		    componentSearch,
 			goodsList,
-			uniBadge
+			uniBadge,
+			skeleton
 		},
 		data(){
 			return{
@@ -107,7 +135,7 @@
 				
 				pageData:{
 					 pageStart:1,//页码
-					 pageNum:7,//每页有多少条数据
+					 pageNum:20,//每页有多少条数据
 					 navigateLastPage:1,//总共有几页
 					 allData:0 //总共有多少条数据
 					},
@@ -118,27 +146,25 @@
 				 
 				 // cartNum:app.globalData.cartNum,
 				 hackReset:false,//强制刷新子组件
-				
+				isLoading:false,
+				skeletonNum:[1,2,3,4],
 				 
 				 
 			}
 		},
-		created() {
-		    // 数据加载
-		    this.init();
+
+		onLoad(){
+			// 数据加载
+			this.init();
+			this.isLoading = true;
 			
 		},
-		onShow(){
-			
-			
+		onShow(){	
 				this.hackReset = false;
 				this.$nextTick(() => {
 					this.hackReset = true;
-				})
-			
-
+				})		
 		},
-		
 		methods:{
 			// 获取数据
 			init() {			
@@ -180,7 +206,9 @@
 				
 				
 			},
-			
+			touchFalse(){
+				return false;
+			},
 			//搜索事件
 			toSearch() {
 				uni.navigateTo({
@@ -209,7 +237,7 @@
 				this.goodsListData = [];
 				this.pageData={
 					 pageStart:1,
-					 pageNum:7,
+					 pageNum:20,
 					 allData:0
 				}
 				this.get_goods_list(this.data_content.children[this.nav_active_item_two_index].key)
@@ -233,8 +261,12 @@
 					pageSize:_this.pageData.pageNum,
 					price:price,
 				}
+				
 				// console.log(params,"params")
-				getListGoodsDetail(params).then(res=>{
+				getListGoodsDetail(params).then(res=>{		
+					setTimeout(()=>{
+						this.isLoading = false;
+					},200)
 					if (res.return_code == '000000') {
 						if(res.return_data.list.length > 0){
 							_this.goodsListData =_this.goodsListData.concat(res.return_data.list);
@@ -265,7 +297,7 @@
 				
 				// pageData:{
 				// 	 pageStart:1,//页码
-				// 	 pageNum:7,//每页有多少条数据
+				// 	 pageNum:20,//每页有多少条数据
 				// 	 navigateLastPage:1,//总共有几页
 				// 	 allData:0 //总共有多少条数据
 				// 	},
@@ -315,11 +347,15 @@
 				
 			},
 			
+			
+			
 		}
 	}
 </script>
 
 <style scoped>
+
+	
 @import url("./classify.css");
 .gouwuche {
 	position: absolute;
@@ -341,4 +377,61 @@
 	font-size: 24px !important;
 	color: #F0AD4E;
 }
+
+
+/* 
+ */
+
+
+.spinner {
+ width: 60px;
+ height: 60px;
+ position: relative;
+ left: calc(50% - 30px);
+ top:calc(50% - 25px);
+}
+
+.spinner .dot {
+ position: absolute;
+ inset: 0;
+ display: flex;
+ justify-content: center;
+}
+
+.spinner .dot::after {
+ content: "";
+ width: 7px;
+ height: 7px;
+ border-radius: 50%;
+ background-color: rgb(12, 180, 231);
+}
+
+@keyframes spin {
+ to {
+  transform: rotate(360deg);
+ }
+}
+
+.spinner .dot {
+ animation: spin 2s infinite;
+}
+
+.spinner .dot:nth-child(2) {
+ animation-delay: 100ms;
+}
+
+.spinner .dot:nth-child(3) {
+ animation-delay: 200ms;
+}
+
+.spinner .dot:nth-child(4) {
+ animation-delay: 300ms;
+}
+
+.spinner .dot:nth-child(5) {
+ animation-delay: 400ms;
+}
+
+
+
 </style>
\ No newline at end of file
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index 959528f..f3c4506 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -81,7 +81,7 @@
 								<view class="font16 fontwig6 fcor333 alijusstart">
 										<image mode="widthFix" :src="imageUrl+'orderLogo/goods.png'" v-if="row.productType == 12"
 											class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
-									<view class="width100 text1">{{row.title}}</view>
+									<view class="width100 text1">{{row.title.replaceAll("+", "|")}}</view>
 								</view>
 							</view>
 							<view class="po-ra mart10">
diff --git a/physical-merchants/address/addNewAddress/addNewAddress.vue b/physical-merchants/address/addNewAddress/addNewAddress.vue
index 17de1d3..c5c90dc 100644
--- a/physical-merchants/address/addNewAddress/addNewAddress.vue
+++ b/physical-merchants/address/addNewAddress/addNewAddress.vue
@@ -3,70 +3,73 @@
 		<form @submit="form_submit" class="form-container">
 			<view class="pd-main height100">
 				<view class="form-gorup  backcolorfff">
-					<view class="form-gorup-item-left">
+					<!-- <view class="form-gorup-item-left">
 						<view class="form-gorup-title marb10">联系人<text class="form-group-tips-must">*</text></view>
 						<input type="text" name="name" v-model="userAddress.name" maxlength="5"
-							placeholder-class="fcor666" class="fcor666 " placeholder="联系人2~5个字符">
+							placeholder-class="corf6" class="fcor666 " placeholder="联系人2~5个字符">
 					</view>
 					<view class="form-gorup-item-right">
 						<view class="form-gorup-title marb10">联系电话<text class="form-group-tips-must">*</text></view>
 						<input type="number" name="tel" v-model="userAddress.tel" maxlength="11"
-							placeholder-class="fcor666" class="fcor666" placeholder="手机号">
+							placeholder-class="corf6" class="fcor666" placeholder="手机号">
+					</view> -->
+					<!--  -->
+					
+						<view class="form-gorup-title">联系人<text class="form-group-tips-must">*</text>
+						</view>
+						<input type="text" name="name" v-model="userAddress.name" maxlength="5"
+						placeholder-class="corf6" class="fcor666 bs-bb" placeholder="联系人2~5个字符">
+					
+					<view class="width100 mart10 border-b">
+						
 					</view>
+					
+					<view class="form-gorup-title">联系电话<text class="form-group-tips-must">*</text>
+					</view>
+					<input type="number" name="tel" v-model="userAddress.tel" maxlength="11"
+						placeholder-class="corf6" class="fcor666" placeholder="手机号">
+					
+					<!--  -->
 				</view>
 
 				<view class="form-gorup backcolorfff">
-
-					<!-- <view> -->
-						<!-- <view class="form-gorup-title">省市区<text class="form-group-tips-must">必选</text></view> -->
-						<!-- <view class="dis-flex flex-sp" @click="chooseAddress">
-							<input type='text' placeholder='请选择地址' :disabled="true" name='region'
-								:value='userAddress.region' class="fcor666 flex-1">
-							<view class="icon-ymt to-right font14 fcor666">
-
-							</view>
-							
-							
-							
-						</view> -->
-						<!--  -->
 						<view class="">
 							<pick-regions :defaultRegion="defaultRegionCode"  @getRegion="handleGetRegion">
 								<view class="dis-flex flex-sp form-gorup-title">
 									<view class=" flex-1">点击选择省市区<text class="form-group-tips-must">必选</text></view>
-									<!-- <input type='text' placeholder='请选择地址' :disabled="false" name='region'
-										v-model='userAddress.region' class=" flex-1 fcor333" placeholder-class="fcor333" style="font-size: 16px;">
-										 -->
+									
 									<view class="icon-ymt to-right font14 fcor666">
 									
 									</view>
 								</view>
 								
 							</pick-regions>
-							<view class="font15 fcor666" style="height: 20px;line-height: 20px;">{{userAddress.region || '请选择'}}</view>
+							<view class=" pickRes fcor666" >{{userAddress.region || '请选择'}}</view>
 						</view>
 						
-
-					<!-- </view> -->
+						<view class="width100 mart10  border-b">
+							
+						</view>
+					
 
 					<view style="clear: both;">
 						<view class="form-gorup-title">详细地址<text class="form-group-tips-must">*</text>
 
 						</view>
 						<input type="text" name="address" v-model="userAddress.address" maxlength="40"
-							placeholder-class="fcor666" :class="'fcor666 bs-bb '" placeholder="详细地址1~40个字符">
+							placeholder-class="corf6" :class="'fcor666 bs-bb '" placeholder="详细地址1~40个字符">
 
 					</view>
 
 				</view>
 
 				<view class="default-checkbox " @click="defaultChange">
-					<radio :checked="userAddress.is_default" style="transform:scale(0.7)" color="#FF1A34" />
-					<text class="">设为默认地址</text>
+					<radio :checked="userAddress.is_default" style="transform:scale(1.1)" color="#FF1A34" />
+					<text class="font18">设为默认地址</text>
 				</view>
 
 				<view class="bottom-fixed padding-main">
-					<button class=" " type="default" form-type="submit">保存</button>
+					<button class="btn " type="default" form-type="submit">保存</button>
 				</view>
 			</view>
 			
@@ -337,11 +340,21 @@
 		width: 100%;
 		box-sizing: border-box;
 		z-index: 2;
+		.btn{
+			height: 60px;
+			border-radius: 30px;
+			background-color: #3da7e7;
+			margin-bottom: 15px;
+			color: #ffffff;
+			line-height: 60px;
+			font-size: 18px;
+		}
 	}
 
+
 	.page-bottom-fixed {
 		height: 100vh;
-		padding-bottom: 120rpx;
+		padding-bottom: 80px;
 		box-sizing: border-box;
 	}
 
@@ -355,12 +368,12 @@
 			border-radius: 20rpx;
 			overflow: auto;
 
-			input {
+			.pickRes , input {
 				border-radius: 0;
 				box-sizing: border-box;
-				font-size: 28rpx;
-				height: 70rpx;
-				line-height: 70rpx;
+				font-size: 18px;
+				height: 30px;
+				line-height: 30px;
 			}
 
 		}
@@ -369,7 +382,7 @@
 			padding: 20rpx 0;
 			margin-bottom: 5rpx;
 			font-weight: 500;
-			font-size: 16px;
+			font-size: 18px;
 		}
 	}
 
@@ -384,65 +397,4 @@
 		color: #f00;
 	}
 
-	/*
-   * 三级联动
-   */
-	// .select-address {
-	//     box-sizing: border-box;
-	//     height: 70rpx;
-	//     line-height: 70rpx;
-	//     padding: 0 10rpx;
-	//  height: auto;
-	//  overflow: auto;
-	//  .fl{
-	//  		   float: left;
-	//  }
-	// }
-	// .select-address .section {
-	//     width: 33.33%;
-	//     box-sizing: border-box;
-
-	// }
-	// .select-address .section:not(:first-child) {
-	//     padding: 0 5rpx;
-	// }
-
-	/**
-    * 地址信息
-    */
-	// .default-checkbox image {
-	//     width: 35rpx;
-	//     height: 35rpx !important;
-	// }
-	// .address-value {
-	//     padding-right: 110rpx;
-	// }
-	// .map-icon {
-	//     bottom: 0;
-	//     right: 0;
-	//     width: 90rpx;
-	//     height: 80rpx;
-	//     line-height: 80rpx;
-	// }
-	// .auto-discern {
-	//     bottom: 20rpx;
-	//     right: 20rpx;
-	//     z-index: 2;
-	// }
-	// .auto-discern button {
-	//     line-height: inherit;
-	//     padding: 5rpx 20rpx !important;
-	// }
-
-	/*
-   * 身份信息
-   */
-	// .idcard-container {
-	//     background: #e6e6e6;
-	// }
-	// .idcard-container .form-upload-data .item image {
-	//     width: 256rpx;
-	//     height: 170rpx;
-	//     border: 1px dashed #c2c2c2;
-	// }
 </style>
diff --git a/physical-merchants/address/address.vue b/physical-merchants/address/address.vue
index 327d610..eb5d76a 100644
--- a/physical-merchants/address/address.vue
+++ b/physical-merchants/address/address.vue
@@ -4,7 +4,7 @@
 
 		<scroll-view scroll-y="true" class="address-contain paading10">
 			<radio-group @change="radioChange">
-				<view v-for="(item,index) in addressList" @click.stop="chooseAddress(item)" :key="item.id"
+				<view v-for="(item,index) in addressList" @click="chooseAddress(item)" :key="item.id"
 					class="border-8r paading10 backcolorfff marb10">
 					<view class="user-msg border-b paddbotm5">
 						<view class=" mart3 ">
@@ -19,14 +19,14 @@
 					<view class="user-handle mart10">
 						<view class="handle-left">
 							<!-- <radio  :checked="item.whetherDefault" style="transform:scale(0.7)"  :value="item.id" color="#FF1A34" /> -->
-							<radio :checked="selectId == item.id" style="transform:scale(0.7)" :value="item.id"
+							<radio @click.stop :checked="selectId == item.id" style="transform:scale(1.1)" :value="item.id"
 								color="#FF1A34" />
 							<text class=" margle">默认地址</text>
 						</view>
 						<view class="handle-right">
-							<button type="primary" class="marRight10" plain="true" size="mini"
+							<button class="marRight10 btn edit" 
 								@click.stop="editAddress(item.id)">编辑</button>
-							<button type="warn" plain="true" size="mini"
+							<button   class="del btn"
 								@click.stop="deleteAddress(item.id)">删除</button>
 						</view>
 					</view>
@@ -72,6 +72,9 @@
 			if (options.status) { //1:从订单确认页面跳过来的
 				this.status = options.status;
 			}
+			
+		},
+		onShow(){
 			this.initData()
 		},
 		methods: {
@@ -245,7 +248,7 @@
 		overflow: hidden;
 
 		.address-contain {
-			height: calc(100vh - 70px);
+			height: calc(100vh - 80px);
 			width: calc(100% - 20px);
 		}
 
@@ -257,6 +260,26 @@
 
 		.handle-right {
 			vertical-align: middle;
+			
+			display: flex;
+			align-items: center;
+			.edit{
+				background-color: #1aad19;
+				
+			}
+			.del{	
+				background-color: #e64340;	
+			}
+			.btn{
+				box-sizing: content-box;
+				font-size: 15px;
+				height: 40px;
+				line-height: 40px;
+				width: 80rpx;
+				border-radius: 10px;
+				// padding: 6px 30rpx;
+				color:#ffffff !important;
+			}
 		}
 	}
 
@@ -268,20 +291,23 @@
 		bottom: 0;
 		left: 0;
 		right: 0;
-		height: 50px;
-		line-height: 50px;
-		box-sizing: border-box;
 		display: flex;
 		justify-content: space-around;
 		align-items: center;
-
+		margin-bottom: 15px;
 		.add-btn {
-			width: 45%;
-			height: 40px;
-			line-height: 40px;
+			width: 80%;
 			text-align: center;
-			border-radius: 20px;
-
+			height: 60px;
+			border-radius: 30px;
+			background-color: #3da7e7;
+			
+			color: #ffffff;
+			line-height: 60px;
+			font-size: 18px;
+			
+			
+			
 			&:first-of-type {
 				background-color: #F6C133;
 			}
diff --git a/physical-merchants/classify/cart/cart.vue b/physical-merchants/classify/cart/cart.vue
index e1c19a2..f01baac 100644
--- a/physical-merchants/classify/cart/cart.vue
+++ b/physical-merchants/classify/cart/cart.vue
@@ -1,24 +1,20 @@
 <template>
 	<view class="">
-		<!-- v-if="cartList.length>0"  -->
-
-		<view class="cart-container backcor9">
-			<scroll-view :scroll-y="true" class="cart-list">
-
+		<view  class="cart-container backcor9" @touchmove.stop>
+			<scroll-view v-if="cartList.length>0" :scroll-y="true" class="cart-list">
 				<uni-swipe-action>
-
 					<!-- 从这里开始遍历-->
 					<view v-for="(item,index) in cartList"
 						:class="(item.loseEfficacy?' loseEfficacy ':' ')+'marb10 border-8r backcolorfff paading10'"
-						:key="item.id">
+						:key="item.id" @click="goGoodsDetail(item.goodsId)">
 
 						<!-- :disabled="item.loseEfficacy" -->
 						<uni-swipe-action-item :auto-close="autoClose" :right-options="swipe_options"
-							@click="swipe_opt_event($event,item.id)" @change="swipe_change($event, item.id)">
+							@click.stop="swipe_opt_event($event,item.id)" @change="swipe_change($event, item.id)">
 
 							<view class="cart-container2">
 								<checkbox-group @change="checkClick(item)">
-									<checkbox class="mycheck" :disabled="!isEdit&&item.loseEfficacy" color="#FFC71E"
+									<checkbox @click.stop  class="mycheck" :disabled="!isEdit&&item.loseEfficacy" color="#FFC71E"
 										:value="item.id" :checked="item.whetherCheck" />
 								</checkbox-group>
 								<view class="cart-detail">
@@ -34,7 +30,7 @@
 
 										<view class="cart-msg-price">
 											<view class="dis-flex">
-												<view class="cart-price font16 fcorred">
+												<view class="cart-price font18 fcorred">
 													<!-- ¥ <text class="font20">18 </text>.8 -->
 													¥{{item.price}}
 												</view>
@@ -43,7 +39,7 @@
 												</view> -->
 											</view>
 
-											<view :class="'cart-num'+(item.loseEfficacy?' pont-event ':' ')">
+											<view @click.stop :class="'cart-num'+(item.loseEfficacy?' pont-event ':' ')">
 
 												<uni-number-box v-model="item.num" :min="1"
 													@noMoreLess="noMoreLess(item.id+'')"
@@ -59,33 +55,44 @@
 
 					</view>
 
-					<noMore></noMore>
-
 				</uni-swipe-action>
-
+				<noMore ></noMore>
+				
 			</scroll-view>
+			
+			<view v-if="cartList.length==0" class="empy-cart fcor666  fotct cart-list  backcor9">
+				<view   class="icon cart fcor666 font48"></view>
+				<view class=" mart30">
+					购物车内暂无商品，快去逛逛吧
+				</view>
+				<view @click="goClassify" class="btn-go mart20">
+					去逛逛
+				</view>
+			</view>
+			
+			
 			<view class="cart-tool bg-white">
 				<view class="select-all">
 					<checkbox-group @change="checkAllClick">
 						<label>
 							<!-- :disabled="cartList.length == 0" -->
 							<checkbox class="mycheck" color="#FFC71E" :value="allCheck.value"
-								:checked="allCheck.whetherCheck" />
-							<text class="paddleft5 font16 fcor777">全选</text>
+								:checked="allCheck.whetherCheck"  style="transform: scale(1.1);"/>
+							<text class="paddleft5  fcor777">全选</text>
 						</label>
 						<!--  -->
 					</checkbox-group>
-					<text v-if="!isEdit" class="paddleft5 fcorred font16" @click="editDelete">编辑</text>
+					<text v-if="!isEdit" class="paddleft5 fcorred " @click="editDelete">编辑</text>
 					<text v-if="isEdit" class="icon-ymt delete paddleft5 fcorred" @click="deleteCart"></text>
 
 				</view>
-				<text v-if="isEdit" class="tool-right paddleft5 fcorred" @click="editDelete">退出编辑</text>
-				<view v-if="!isEdit" class="tool-right">
+				<text v-if="isEdit" class="tool-right paddleft5 fcorred " @click="editDelete">退出编辑</text>
+				<view v-if="!isEdit" class="tool-right ">
 					<view class="tool-jiesuan marRight10 ">
 
 						<!-- <text v-if="priceOrigin > 0" class="fcor666 margle10 marRight10 font14 text-lt">¥{{priceOrigin}}</text> -->
-						合计:<text v-if="priceAll>0" class="fcorred">¥{{priceAll | numFormat}}</text>
-							<text v-else class="fcorred">¥{{priceAll}}</text>
+						合计:<text v-if="priceAll>0" class="fcorred font20">¥{{priceAll | numFormat}}</text>
+							<text v-if="priceAll==0" class="fcorred">¥{{priceAll}}</text>
 
 					</view>
 					<view class="jiesuan-btn fcorfff " @click="settleAccount">
@@ -97,19 +104,13 @@
 			</view>
 		</view>
 
-		<!-- <view v-else class="cart-container backcor9">
-			<view class="">
-				购物车内暂无商品，快去购物吧
-			</view>
-
-		</view> -->
+		
 	</view>
 
 
 </template>
 
 <script>
-	// import cartList from '@/pages/classify/cart-list/cart-list.vue'
 	import noMore from '@/components/no-more/no-more.vue'
 	import uniNumberBox from '@/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue'
 	import {
@@ -207,14 +208,7 @@
 
 			// }
 		},
-		onLoad() {
-
-			// this.cartList.map(item=>{
-			// 	this.$set(item, 'checked', false);
-			// })
-			// this.initData();
-
-		},
+		
 		onShow(){
 			this.initData();
 		},
@@ -436,7 +430,12 @@
 							let params = {
 								ids: ids
 							};
+							uni.showLoading({
+									title: '加载中',
+									mask:true,
+								});
 							deleteShoppingCart(params).then(res => {
+								uni.hideLoading();
 								let title;
 								if (res.return_code == '000000') {
 									title = res.return_data;
@@ -455,16 +454,22 @@
 
 						} else if (res.cancel) {
 
-							console.log('用户点击取消');
+							// console.log('用户点击取消');
 						}
 					}
 				});
 
 			},
+			
+			// 点击去商品详情
+			goGoodsDetail(goodsId){
+				uni.navigateTo({
+					 url: '/physical-merchants/classify/goodsDetail/goodsDetail?goodsId=' + goodsId
+							
+				})
+			},
 
 			changeNumValue(v, id) {
-				console.log(v, id)
-				// console.log(this.cartList)
 				let params = {
 					id: id,
 					num: v
@@ -500,7 +505,12 @@
 
 				})
 
-			}
+			},
+			goClassify(){
+				uni.switchTab({
+					url:'/pages/tabBar/classify/classify'
+				})
+			},
 
 		}
 
@@ -508,6 +518,23 @@
 </script>
 
 <style lang="scss" scoped>
+	
+	.empy-cart{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+	.btn-go{
+		width: 40%;
+		height: 40px;
+		line-height: 40px;
+		border-radius: 20px;
+		border:1px solid #FF8F19;
+		color: #FF8F19;
+		
+		/* #FFCC1E, #FF8F19 */
+	}
 	.bg-white {
 		background-color: #fff;
 	}
@@ -520,7 +547,7 @@
 	}
 
 	.cart-list {
-		height: calc(100vh - 70px);
+		height: calc(100% - 80px);
 	}
 
 	// 列表
@@ -617,7 +644,7 @@
 		right: 0;
 		box-sizing: border-box;
 		padding: 10px;
-		height: 60px;
+		height: 80px;
 		// line-height: 60px;
 		display: flex;
 		justify-content: space-between;
@@ -637,11 +664,11 @@
 			.tool-jiesuan {}
 
 			.jiesuan-btn {
-				width: 200rpx;
-				height: 40px;
-				line-height: 40px;
+				width: 240rpx;
+				height: 50px;
+				line-height: 50px;
 				text-align: center;
-				border-radius: 20px;
+				border-radius: 25px;
 				background: linear-gradient(to right, #FFCC1E, #FF8F19);
 			}
 		}
diff --git a/physical-merchants/classify/goods-search/goods-search.vue b/physical-merchants/classify/goods-search/goods-search.vue
index 8401955..69380b4 100644
--- a/physical-merchants/classify/goods-search/goods-search.vue
+++ b/physical-merchants/classify/goods-search/goods-search.vue
@@ -34,7 +34,7 @@
 				keywordsSearh: '',
 				page: {
 					pageStart: 1, //页码
-					pageNum: 7, //每页有多少条数据
+					pageNum: 20, //每页有多少条数据
 					navigateLastPage: 1, //总共有几页
 					allData: 0 //总共有多少条数据
 				},
@@ -58,7 +58,7 @@
 				this.data_list = [];
 				this.page = {
 					pageStart: 1, //页码
-					pageNum: 7, //每页有多少条数据
+					pageNum: 20, //每页有多少条数据
 					navigateLastPage: 1, //总共有几页
 					allData: 0 //总共有多少条数据
 				}
diff --git a/physical-merchants/classify/goodsDetail/goodsDetail.vue b/physical-merchants/classify/goodsDetail/goodsDetail.vue
index 1007509..7a6072e 100644
--- a/physical-merchants/classify/goodsDetail/goodsDetail.vue
+++ b/physical-merchants/classify/goodsDetail/goodsDetail.vue
@@ -2,7 +2,7 @@
 	<view class="">
 		<!-- 商品主图轮播 -->
 		<view class="swiper-box">
-			<swiper circular="true" :autoplay="false" style="height: 188px;" @change="swiperChange">
+			<swiper circular="true" :autoplay="false" style="height: 288px;" @change="swiperChange">
 				<swiper-item class="fotct" v-for="(swiper,index) in goodsDetail.bannerImg" :key="index">
 					<image mode="heightFix" :src="swiper" @click="perImage(index,goodsDetail.bannerImg)"></image>
 				</swiper-item>
@@ -26,20 +26,20 @@
 
 			<!-- 选择参数 -->
 			<view class="br bg-white parameter  width100 " @click="showPopup(1)">
-				<view class="color999 ">
+				<view class=" ">
 					选择
 				</view>
-				<view class=" ">
+				<view class="color999 ">
 					规格
 				</view>
 				<view class="icon-ymt to-right"></view>
 			</view>
 			<!-- 保障 -->
 			<view class="br bg-white parameter  width100 " @click="showPopup(2)">
-				<view class="color999 ">
+				<view class=" ">
 					保障
 				</view>
-				<view class=" ">
+				<view class="color999 ">
 					破损包赔 · 假一赔四 · 退货运费险
 				</view>
 				<view class="icon-ymt to-right"></view>
@@ -89,7 +89,7 @@
 
 
 		<!-- 选择类别 -->
-		<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
+		<wybPopup ref="popup"  height="500"   type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
 
 			<cart-choose :goodsDetail="goodsDetail" :status="status" @refreshCartNum="refreshCartNum"
 				:specificationList="specificationList" @close="close"></cart-choose>
diff --git a/physical-merchants/classify/order/orderDetail.vue b/physical-merchants/classify/order/orderDetail.vue
index 061db92..1ffcc32 100644
--- a/physical-merchants/classify/order/orderDetail.vue
+++ b/physical-merchants/classify/order/orderDetail.vue
@@ -122,7 +122,7 @@
 			<!-- 价格总额 -->
 			<view class="tr fontwig6  pd-tb10">
 				<!-- <text class="paddtright10">已优惠<text class="fcorred">¥ 12.01</text></text> -->
-				<view v-if="recinfo.orderStatus == 1 ||recinfo.orderStatus == 5 " class="dis-flex flex-end">商品总金额<text class="margle10 font22">¥{{recinfo.payablePrice | numFormat}}</text> </view>
+				<view v-if="recinfo.orderStatus == 1 ||recinfo.orderStatus == 5 " class="dis-flex flex-end">商品总金额<text class="margle10 font22">¥{{recinfo.payPrice | numFormat}}</text> </view>
 				<view v-else class="dis-flex flex-end">实付 <text class="font22 margle10">¥{{recinfo.payRealPrice}}</text></view>
 			</view>
 
@@ -487,7 +487,7 @@
 				let obj = {
 					orderNo : this.recinfo.orderNo,
 					createTime:this.recinfo.createTime,
-					payPrice:this.recinfo.payablePrice
+					payPrice:this.recinfo.payPrice
 				}
 				obj = JSON.stringify(obj)
 				uni.navigateTo({
diff --git a/physical-merchants/classify/order/pay.vue b/physical-merchants/classify/order/pay.vue
index 0f98df7..f2c127b 100644
--- a/physical-merchants/classify/order/pay.vue
+++ b/physical-merchants/classify/order/pay.vue
@@ -486,7 +486,7 @@
 
 <style lang="scss" scoped>
 	.bor-b {
-		border-bottom: 1px solid #f6f6f6;
+		border-bottom: 1px solid #666666;
 
 		&:last-of-type {
 			border-bottom: none;
@@ -494,7 +494,8 @@
 	}
 
 	.pay-syt {
-		height: 100vh;
+		height:calc(100vh - 60px);
+		overflow: auto;
 	}
 
 	.pay-img {
@@ -517,9 +518,10 @@
 
 	.btn-edit {
 
-		height: 40px;
-		border-radius: 20px;
-		line-height: 40px;
+		height: 50px;
+		border-radius: 25px;
+		line-height: 50px;
 		background-color: #EA3E44;
+		margin-bottom: 10px;
 	}
 </style>
diff --git a/physical-merchants/classify/order/paymentResult.vue b/physical-merchants/classify/order/paymentResult.vue
index 823b073..db30b06 100644
--- a/physical-merchants/classify/order/paymentResult.vue
+++ b/physical-merchants/classify/order/paymentResult.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="pay-suc ">
 		<view class="top-con font18">
-			<view class="colorgr icon-ymt zhenque font22"></view>
+			<view class="colorgr icon-ymt zhenque font48"></view>
 			<view class="mart5">支付成功</view>
 			<view class="mart5">¥<text class="fontwig6 font24">{{recinfo.payablePrice}}</text></view>
 			<view class="mart5 font16 ">{{ recinfo.payType | filtersType}}支付</view>
diff --git a/physical-merchants/settleAccounts/detail-popup/detail-popup.vue b/physical-merchants/settleAccounts/detail-popup/detail-popup.vue
index 3422209..e023ef4 100644
--- a/physical-merchants/settleAccounts/detail-popup/detail-popup.vue
+++ b/physical-merchants/settleAccounts/detail-popup/detail-popup.vue
@@ -1,7 +1,7 @@
 <template>
 
 	<!-- 选择类别 -->
-	<wybPopup ref="popup" @hide="hide" type="bottom" width="500" scrollY="true" radius="0" :showCloseIcon="true">
+	<wybPopup ref="popup" @hide="hide" type="bottom" height="500" width="500" scrollY="true" radius="0" :showCloseIcon="true">
 		<!-- 货品 -->
 		<view v-if="keywords == 'goods'" class="pop-contain pd-main">
 			<view class="pop-title fontwig6"><text>商品列表</text></view>
@@ -89,7 +89,7 @@
 
 			<view class="pop-title fontwig6"><text>积分说明</text></view>
 			<view class="pop-content">
-				<view class="flex-row  pd10">
+				<!-- <view class="flex-row  pd10">
 					<view class="font16">
 						运费总计
 					</view>
@@ -120,12 +120,12 @@
 				</view>
 				<view class="font14 color999 marb5">
 					基础运费6元
-				</view>
+				</view> -->
 				<view class="font14 color999 marb5">
-					不同城市、地区之间收费规则会略有不同。
+					100积分抵扣1元
 				</view>
 				<view class="font14 color999 marb5">
-					运费优惠仅针对基础运费部分进行抵扣;
+					当积分把金额抵扣为0时,需要输入支付密码进行确认;
 				</view>
 			</view>
 		</view>
diff --git a/physical-merchants/settleAccounts/settleAccounts.vue b/physical-merchants/settleAccounts/settleAccounts.vue
index b8def35..2233581 100644
--- a/physical-merchants/settleAccounts/settleAccounts.vue
+++ b/physical-merchants/settleAccounts/settleAccounts.vue
@@ -171,7 +171,7 @@
 				</view>
 			</view>
 			<view class="width100">
-				<textarea class="border-8r backcor9 paading10 note" @blur="noteBlur" @input="noteInput" :focus="true"
+				<textarea :cursor-spacing="50" class="border-8r backcor9 paading10 note"  :focus="false"
 					:disable-default-padding="false" v-model="noteValue" maxlength="40"
 					placeholder="请输入备注信息"></textarea>
 
@@ -390,11 +390,9 @@
 			if (this.goodsList.length > 1) {
 				this.isMoreThanOne = true;
 			}
-			this.getAddrPrice() //查询收货地址包邮金额和运费金额
-
 		},
 		onShow() {
-
+			this.getAddrPrice() //查询收货地址包邮金额和运费金额
 			this.getUserDiscount() //查询优惠券
 			this.findUser() //查询用户相关内容
 		},
@@ -422,45 +420,28 @@
 			},
 			//初始化查询地址
 			getAddrPrice() {
+				if(this.haveAddress){
+					return
+				}
+				
 				uni.showLoading({
 					title: '加载中',
 					mask: true,
 				});
 
 				getAddressPrice().then(res => {
-
+					uni.hideLoading();
 					if (res.return_code == '000000') {
-
 						if (res.return_data) {
-
-							uni.hideLoading();
-							// this.addressDetail =res.return_data.deliveryAddress; 
-							/*
-							address: "nclanfpqwnc"
-							consignee: "小明"
-							createTime: 1681788155000
-							ext1: null
-							ext2: null
-							ext3: null
-							id: 7
-							opId: null
-							opName: null
-							phone: "15983446565"
-							regionId: "110101"
-							regionName: "北京市,市辖区,东城区"
-							updateTime: 1681788174000
-							userId: 204040
-							whetherDefault: true
 							
-							*/
 							this.getRegiFreight(res.return_data.deliveryAddress)
 						}
 					} else {
-						uni.showToast({
-							title: res.return_msg,
-							icon: 'none',
-							duration: 2000
-						})
+						// uni.showToast({
+						// 	title: res.return_msg,
+						// 	icon: 'none',
+						// 	duration: 2000
+						// })
 					}
 
 
@@ -580,13 +561,7 @@
 					}
 				});
 			},
-			// 失去焦点
-			noteBlur() {
-				// console.log(12)
-			},
-			noteInput() {
-				// console.log(12)
-			},
+			
 
 
 
@@ -705,7 +680,7 @@
 						let obj = {
 							orderNo : res.return_data.orderNo,
 							createTime:res.return_data.createTime,
-							payPrice:res.return_data.payablePrice
+							payPrice:res.return_data.payPrice
 							
 						}
 						obj = JSON.stringify(obj)
@@ -786,7 +761,7 @@
 	.settleAccounts {
 
 		box-sizing: border-box;
-		padding-bottom: 130px;
+		padding-bottom: 140px;
 	}
 
 	//商品图片
@@ -855,7 +830,7 @@
 	}
 
 	.tool-right {
-		flex: 1;
+		// flex: 1;
 		display: flex;
 		justify-content: space-between;
 		padding: 10px;
@@ -864,11 +839,13 @@
 		.tool-jiesuan {}
 
 		.jiesuan-btn {
-			width: 200rpx;
-			height: 40px;
-			line-height: 40px;
+			flex: 1;
+			// width: 200rpx;
+			width: 100%;
+			height: 50px;
+			line-height: 50px;
 			text-align: center;
-			border-radius: 20px;
+			border-radius: 25px;
 			background: linear-gradient(to right, #FFCC1E, #FF8F19);
 		}
 	}
diff --git a/uni.scss b/uni.scss
index 71a1571..295456f 100644
--- a/uni.scss
+++ b/uni.scss
@@ -269,7 +269,9 @@ $uni-font-size-paragraph:30upx;
 .colorccc{
 	color:#cccccc !important;
 }
-
+.corf6{
+	color:#bcbcbc !important;
+}
 
 .backcorf2f6 {
 	background-color: #2f6f43;
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue b/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue
index 8a16b17..b560a3c 100644
--- a/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue
@@ -122,7 +122,7 @@
 
 	.uni-tab__cart-box {
 		flex: 1;
-		height: 50px;
+		height: 60px;
 		background-color: #fff;
 		z-index: 900;
 	}
diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
index 49eb3e0..6ec9ff1 100644
--- a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
+++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
@@ -155,7 +155,7 @@
 	};
 </script>
 <style lang="scss" scoped>
-	$box-height: 26px;
+	$box-height: 30px;
 	$bg: #f5f5f5;
 	$br: 2px;
 	$color: #333;
@@ -174,7 +174,7 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: center;
-		padding: 0 8px;
+		padding: 0 12px;
 		background-color: $bg;
 		/* #ifdef H5 */
 		cursor: pointer;