auto commit

config/config.js

@@ -22,8 +22,8 @@ const config = {
 
 	// 公司测试配置
 	apiBaseurl:'http://wx.hw.hongweisoft.com/forestapi/forest-portal',//测试
-	// loginUrl:'http://wx.hw.hongweisoft.com/forestapi/forest-portal/wechat/h5/authorize?returnUrl=http://172.16.90.25:8080/#/',
-	loginUrl:'http://wx.hw.hongweisoft.com/forestapi/forest-portal/wechat/h5/authorize?returnUrl=http://wx.hw.hongweisoft.com/hhforest/',//登录后跳转到测试链接
+	loginUrl:'http://wx.hw.hongweisoft.com/forestapi/forest-portal/wechat/h5/authorize?returnUrl=http://172.16.90.25:8080/#/',
+	// loginUrl:'http://wx.hw.hongweisoft.com/forestapi/forest-portal/wechat/h5/authorize?returnUrl=http://wx.hw.hongweisoft.com/hhforest/',//登录后跳转到测试链接
 	
 	
 	//online 线上配置

pages/index/index.css

@@ -5,13 +5,15 @@ page{background-color: #F6F7F8;}
 .index >>> .uni-searchbar{background-color: #F6F7F8;}
 
 .index >>> .mescroll-downwarp{z-index: -1;}
-.mescroll-body{overflow: visible;}
+/* .mescroll-body{overflow: visible;} */
 
 .appAdv{height:300rpx;background-color: #F6F7F8;}
 .appAdv .adv-item .pic{width: 100%;}
 .appAdv .adv-item{border-radius: 24rpx;overflow: hidden;transform: scale(0.9);transition: all .3s;}
 .appAdv .adv-item.active{transform: scale(1);}
 
+.mescroll-wrap{margin-bottom: 24rpx;}
+
 /* 快速导航 */
 /* .quick-links{display: flex;flex-wrap: wrap;padding: 0;justify-content: space-between;}
 .quick-links-item{width: 48%;margin-bottom: 24rpx;position: relative;}
@@ -57,10 +59,11 @@ page{background-color: #F6F7F8;}
 .indexproduct .item-wrap:nth-child(even) .item{margin-left: 11rpx;}
 .indexproduct .item-img-wrap{overflow: hidden;width: 100%;height: 322rpx;margin-bottom: 12rpx;border-top-left-radius: 18rpx;border-top-right-radius: 18rpx;}
 .indexproduct .item-img{width: 100%;height: 100%;}
-.indexproduct .item-text-wrap{padding:  0 24rpx 25rpx;padding-right: 0;box-sizing: border-box;height: 150rpx;}
+.indexproduct .item-text-wrap{padding:  0 24rpx 25rpx;padding-right: 0;box-sizing: border-box;height: 190rpx;}
 .indexproduct .merchant{line-height: 33rpx;color: #6BBC6D;font-size: 24rpx;}
 .indexproduct .merchant .postage{height: 24rpx;padding: 0 14rpx;margin-left: 16rpx;line-height: 24rpx;display: inline-block;font-size: 20rpx;background-color: #E1F2E2;border-radius: 12rpx;}
 .indexproduct .item-til{font-size: 32rpx;font-weight: 500;color: #333;line-height: 45rpx;}
+.indexproduct .item-spec{font-size: 24rpx;line-height: 33rpx;height: 36rpx;margin-top: 10rpx;overflow: hidden;}
 .indexproduct .item-addr{font-size: 24rpx;font-weight: 400;color: #666;line-height: 33rpx;margin-bottom: 5rpx;}
 .indexproduct .item-price-info .rmb{font-size: 28rpx;font-weight: 500;color: #FF5030;line-height: 40rpx;}
 .indexproduct .item-price-info .price{font-size: 36rpx;font-weight: 500;color: #FF5030;line-height: 50rpx;}

pages/index/index.vue

@@ -54,30 +54,7 @@
 			</view>
 		</view>
 		<!-- 快速导航 结束 -->
-		<view class="main-body wrap24">
-			<view class="main-body-til noborder color">
-				<view class="til">供应商</view>
-				<view class="con">
-					<navigator class="quick-links-item" url="/pages/supplier/supplier">
-						更多&gt;			
-					</navigator>
-				</view>
-			</view>			
-			<scroll-view class="supplier-list" scroll-x="true">
-				<view class="" style="padding: 0 16rpx 24rpx;">
-				<view class="suppliers">
-					<view class="supplier-list-item" v-for="(item,index) in supplierList" :key="item.id" @click="supplierclick(item.id)" >
-						<view class="supplier-list-item-img">
-							<image v-if="item.files[0]" :src="item.files[0].fileUrl ||'/static/img/defaultsupplierlogo.png'" class="img" mode="aspectFit"></image>
-							<image v-else src="/static/img/defaultsupplierlogo.png" class="img" mode="scaleToFill"></image>
-						</view>
-						<view class="supplier-list-item-til">{{item.compName}}</view>
-					</view>
-				</view>	
-				</view>
-			</scroll-view>
-		</view>		
-		<!-- 供应商结束 -->
+		
 		<view class="category nomal-bottom">
 			<view class="category-item category-item-all" @click="category()" :class="{active:categoryall==true}">全部</view>
 			<scroll-view scroll-x="true" class="scroll-X category-scroll-view">
@@ -87,7 +64,8 @@
 			<!-- <navigator v-for="(item,index) in categorylink" :key="index" class="category-item" :url="'pages/searchresults/searchresults?type=' + item">{{item}}</navigator> -->
 		</view>
 		<!-- 分类链接结束 -->	
-		<mescroll-body class="wrap" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
+		<view class="mescroll-wrap">
+		<mescroll-uni class="wrap" height="800rpx" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
 			<view class="indexproduct">
 				 <view class="item-wrap" v-for="(item,index) in mescrollList" :key="index">
 					<view class="item" :data-id="item.id" @click="jumpDetails(item.id)">
@@ -99,8 +77,11 @@
 								{{item.brandName}}
 								<!-- <text v-if="item.postage" class="postage">包邮</text> -->
 							</view>
-							<view class="item-til f-ellipsis">{{item.name}}</view>							
-							<view class="item-addr f-ellipsis">{{item.umsCompanyInfo}}</view>
+							<view class="item-til f-ellipsis">{{item.name}}</view>
+							<view class="item-spec">
+								<text>规格：</text><text>{{item.spec}}</text>
+							</view>
+							<!-- <view class="item-addr f-ellipsis">{{item.umsCompanyInfo}}</view> -->
 							<view class="item-price-info">
 								<text class="rmb" v-if="item.price">¥</text>
 								<text class="price" :class="!item.price?'noprice':''">{{item.price||"暂无价格"}}</text>
@@ -109,10 +90,34 @@
 						</view>						
 					</view> 
 				 </view>
-			 	
 			</view>			 
-		</mescroll-body>
+		</mescroll-uni>
+		</view>
 		<!-- 商品展示结束 -->
+		<view class="main-body wrap24">
+			<view class="main-body-til noborder color">
+				<view class="til">供应商</view>
+				<view class="con">
+					<navigator class="quick-links-item" url="/pages/supplier/supplier">
+						更多&gt;			
+					</navigator>
+				</view>
+			</view>			
+			<scroll-view class="supplier-list" scroll-x="true">
+				<view class="" style="padding: 0 16rpx 24rpx;">
+				<view class="suppliers">
+					<view class="supplier-list-item" v-for="(item,index) in supplierList" :key="item.id" @click="supplierclick(item.id)" >
+						<view class="supplier-list-item-img">
+							<image v-if="item.files[0]" :src="item.files[0].fileUrl ||'/static/img/defaultsupplierlogo.png'" class="img" mode="aspectFit"></image>
+							<image v-else src="/static/img/defaultsupplierlogo.png" class="img" mode="scaleToFill"></image>
+						</view>
+						<view class="supplier-list-item-til">{{item.compName}}</view>
+					</view>
+				</view>	
+				</view>
+			</scroll-view>
+		</view>		
+		<!-- 供应商结束 -->
 		
 		
 		<uni-popup ref="promotionPopup" type="center">

pages/product/product.vue

@@ -16,6 +16,7 @@
 				<text class="item">保质期：{{product.qualityGuaranteePeriod||"参考包装"}}</text>
 				<!-- <text class="item">生产日期：{{createTime}}</text> -->
 				<text class="item" v-if="product.unit">包装：{{product.unit}}</text>
+				<text class="item" v-if="product.spec">规格：{{product.spec}}</text>
 			</view>
 			<view class="product-info-price">
 				<text class="rmb" v-if="product.price">¥</text>

unpackage/dist/dev/mp-weixin/app.json

@@ -3,16 +3,28 @@
     "pages/index/index",
     "pages/login/login",
     "pages/publish/publish",
-    "pages/publish/chosetype",
+    "pages/publish/chosetype/chosetype",
     "pages/publish/publishtype/publishtype",
     "pages/publish/publishsuccess/publishsuccess",
     "pages/producttype/producttype",
+    "pages/productcategory/productcategory",
     "pages/searchresults/searchresults",
+    "pages/subject/subject",
     "pages/product/product",
     "pages/usercenter/usercenter",
     "pages/usercenter/myfocus/myfocus",
+    "pages/usercenter/focusme/focusme",
+    "pages/usercenter/mypublish/mypublish",
     "pages/usercenter/authentication/authentication",
-    "pages/usercenter/feedback/feedback"
+    "pages/usercenter/myorder/myorder",
+    "pages/usercenter/myorder/orderdetails/orderdetails",
+    "pages/usercenter/bindphone/bindphone",
+    "pages/usercenter/feedback/feedback",
+    "pages/usercenter/addrs/addrs",
+    "pages/confirmorder/confirmorder",
+    "pages/inbuild/inbuild",
+    "pages/supplier/supplier",
+    "pages/supplier/supplierdetail/supplierdetail"
   ],
   "subPackages": [],
   "window": {
@@ -34,7 +46,7 @@
         "text": "首页"
       },
       {
-        "pagePath": "pages/publish/chosetype",
+        "pagePath": "pages/publish/chosetype/chosetype",
         "iconPath": "static/img/icon_publish.png",
         "selectedIconPath": "static/img/icon_publish_active.png",
         "text": "我要发布"
@@ -47,5 +59,6 @@
       }
     ]
   },
-  "usingComponents": {}
+  "usingComponents": {},
+  "sitemapLocation": "sitemap51.json"
 }

unpackage/dist/dev/mp-weixin/components/mescroll-uni/components/mescroll-empty.wxss

@@ -49,7 +49,8 @@
 
 /* 无任何数据的空布局 */
 .mescroll-empty {
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	        box-sizing: border-box;
 	width: 100%;
 	padding: 100rpx 50rpx;
 	text-align: center;
@@ -76,7 +77,8 @@
 	padding: 18rpx;
 	font-size: 28rpx;
 	border: 1rpx solid #e04b28;
-	border-radius: 60rpx;
+	-webkit-border-radius: 60rpx;
+	        border-radius: 60rpx;
 	color: #e04b28;
 }
 .mescroll-empty .empty-btn:active {

unpackage/dist/dev/mp-weixin/components/mescroll-uni/components/mescroll-top.wxss

@@ -56,7 +56,8 @@
 	bottom: 120rpx;
 	width: 72rpx;
 	height: auto;
-	border-radius: 50%;
+	-webkit-border-radius: 50%;
+	        border-radius: 50%;
 	opacity: 0;
 	-webkit-transition: opacity 0.5s;
 	transition: opacity 0.5s; /* 过渡 */

unpackage/dist/dev/mp-weixin/components/mescroll-uni/mescroll-body.wxss

@@ -2,7 +2,8 @@
 	position: relative; /* 下拉刷新区域相对自身定位 */
 	height: auto; /* 不可固定高度,否则overflow:hidden导致无法滑动; 同时使设置的最小高生效,实现列表不满屏仍可下拉*/
 	overflow: hidden; /* 当有元素写在mescroll-body标签前面时,可遮住下拉刷新区域 */
-	box-sizing: border-box; /* 避免设置padding出现双滚动条的问题 */
+	-webkit-box-sizing: border-box;
+	        box-sizing: border-box; /* 避免设置padding出现双滚动条的问题 */
 }
 
 /* 使sticky生效: 父元素不能overflow:hidden或者overflow:auto属性 */
@@ -53,7 +54,8 @@
 	display: inline-block;
 	width: 32rpx;
 	height: 32rpx;
-	border-radius: 50%;
+	-webkit-border-radius: 50%;
+	        border-radius: 50%;
 	border: 2rpx solid gray;
 	border-bottom-color: transparent !important; /*已在style设置border-color,此处需加 !important*/
 	vertical-align: middle;
@@ -87,7 +89,8 @@
 
 /* 上拉加载区域 */
 .mescroll-upwarp {
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	        box-sizing: border-box;
 	min-height: 110rpx;
 	padding: 30rpx 0;
 	text-align: center;
@@ -111,7 +114,8 @@
 	display: inline-block;
 	width: 32rpx;
 	height: 32rpx;
-	border-radius: 50%;
+	-webkit-border-radius: 50%;
+	        border-radius: 50%;
 	border: 2rpx solid gray;
 	border-bottom-color: transparent !important; /*已在style设置border-color,此处需加 !important*/
 	vertical-align: middle;

unpackage/dist/dev/mp-weixin/components/uni-search-bar/uni-search-bar.wxss

@@ -40,7 +40,8 @@
   display: -webkit-box;
   display: -webkit-flex;
   display: flex;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
   overflow: hidden;
   position: relative;
   -webkit-box-flex: 1;

unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,7 +1,9 @@
 {
-  "navigationBarTitleText": "贵州林产品",
+  "navigationBarTitleText": "首页",
+  "navigationStyle": "custom",
   "usingComponents": {
     "uni-search-bar": "/components/uni-search-bar/uni-search-bar",
+    "uni-popup": "/components/uni-popup/uni-popup",
     "mescroll-body": "/components/mescroll-uni/mescroll-body"
   }
 }

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -1,21 +1,40 @@
+page{background-color: #F6F7F8;}
 /* 搜索修改 */
-.search-wrap.data-v-57280228{padding: 10rpx 8rpx;background-color: #fff;}
-.index.data-v-57280228 .uni-searchbar__box{-webkit-box-pack: left;-webkit-justify-content: left;justify-content: left;border: 0;background-color: #F1F1F2!important;}
+.search-wrap{padding: 10rpx 8rpx;background-color: #F6F7F8;}
+.index .uni-searchbar__box{-webkit-box-pack: left;-webkit-justify-content: left;justify-content: left;border: 0;background-color: #ECEDEE!important;}
+.index .uni-searchbar{background-color: #F6F7F8;}
+.index .mescroll-downwarp{z-index: -1;}
+.mescroll-body{overflow: visible;}
+.appAdv{height:300rpx;background-color: #F6F7F8;}
+.appAdv .adv-item .pic{width: 100%;}
+.appAdv .adv-item{-webkit-border-radius: 24rpx;border-radius: 24rpx;overflow: hidden;-webkit-transform: scale(0.9);transform: scale(0.9);-webkit-transition: all .3s;transition: all .3s;}
+.appAdv .adv-item.active{-webkit-transform: scale(1);transform: scale(1);}
 /* 快速导航 */
-.quick-links.data-v-57280228{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-flex-wrap: wrap;flex-wrap: wrap;padding: 0;-webkit-box-pack: justify;-webkit-justify-content: space-between;justify-content: space-between;}
-.quick-links-item.data-v-57280228{width: 48%;margin-bottom: 24rpx;}
-/* .quick-links-item + .quick-links-item{margin-left: 10rpx;} */
-.quick-links-item-til.data-v-57280228{margin-bottom: 10rpx;}
-.quick-links-item-img.data-v-57280228{width: 100%;height: 160rpx;overflow: hidden;border-radius: 10rpx;}
-.quick-links-item-img image.data-v-57280228{width: 100%;height: 100%;}
+/* .quick-links{display: flex;flex-wrap: wrap;padding: 0;justify-content: space-between;}
+.quick-links-item{width: 48%;margin-bottom: 24rpx;position: relative;}
+.quick-links .quick-links-item:nth-child(1){color: #4A90E2;}
+.quick-links .quick-links-item:nth-child(2){color: #397B53;}
+.quick-links .quick-links-item:nth-child(3){color: #9013FE;}
+.quick-links .quick-links-item:nth-child(4){color: #F5A623;}
+.quick-links-item-til{position: absolute;left: 16rpx;top: 16rpx;z-index: 10;font-size: 24rpx;font-weight: bold;}
+.quick-links-item-subtil{position: absolute;left: 16rpx;top: 53rpx;z-index: 10;font-size: 16rpx;}
+.quick-links-item-img{width: 100%;height: 160rpx;overflow: hidden;border-radius: 10rpx;}
+.quick-links-item-img image{width: 100%;height: 100%;} */
+.subject{margin-bottom: 24rpx;display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-pack: justify;-webkit-justify-content: space-between;justify-content: space-between;padding: 0 50rpx;}
+.subject-item{width: 100rpx;text-align: center;}
+.subject-item-img{margin: 0 auto 8rpx;width: 78rpx;height: 78rpx;}
+.subject-item-img .img{width: 100%;height: 100%;}
+.subject-item-til{font-size: 24rpx;color: #417505;line-height: 33rpx;}
 /* 分类链接 */
-.category.data-v-57280228{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-align: center;-webkit-align-items: center;align-items: center;height: 88rpx;line-height: 88rpx;background-color: #fff;}
-.category .category-item.data-v-57280228{position: relative;-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;height: 100%;text-align: center;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 32rpx;color: #666;}
-.category .category-item.active.data-v-57280228{font-size: 36rpx;color: #6BBC6D;}
-.category .category-item.active.data-v-57280228::after{content: '';width: 100%;height: 6rpx;background-color: #6BBC6D;border-radius: 3rpx;position: absolute;left: 0;bottom: 0;}
-.category .category-item-more.data-v-57280228{color: #6BBC6D;width: 150rpx;padding-right: 10rpx;margin-right: 10rpx;}
-.category .category-item-more.data-v-57280228::after{content: '';width: 20rpx;height: 20rpx;position: absolute;right: 10rpx;top: 50%;margin-top: -10rpx;border-top: 1px solid #6BBC6D;border-right: 1px solid #6BBC6D;-webkit-transform: rotate(45deg);transform: rotate(45deg);}
-.category .category-item-all.data-v-57280228{margin-left: 10rpx;}
+.category{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-align: end;-webkit-align-items: end;align-items: end;height: 88rpx;line-height: 88rpx;background-color: #fff;}
+.category .category-item{position: relative;height: 100%;text-align: center;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 32rpx;color: #666;}
+.category .category-item.active{font-size: 36rpx;color: #6BBC6D;}
+.category .category-item.active::after{content: '';width: 100%;height: 6rpx;background-color: #6BBC6D;-webkit-border-radius: 3rpx;border-radius: 3rpx;position: absolute;left: 0;bottom: 0;}
+.category .category-item-more{font-size: 24rpx;color: #6BBC6D;padding-left: 24rpx;margin-right: 10rpx;}
+/* .category .category-item-more::after{content: '';width: 20rpx;height: 20rpx;position: absolute;right: 10rpx;top: 50%;margin-top: -10rpx;border-top: 1px solid #6BBC6D;border-right: 1px solid #6BBC6D;transform: rotate(45deg);} */
+.category .category-item-all{margin-left: 40rpx;}
+.category-scroll-view{-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;overflow: hidden;white-space: nowrap;padding-left: 23rpx;}
+.category-scroll-view .category-item{display: inline-block;margin: 0 23rpx;}
 /* 瀑布流 */
 /* .waterfall{column-count: 2;column-gap: 1vw;padding-top: 1vw;}
 .waterfall .item-wrap{width: 100%;overflow: hidden;border-radius: 24rpx;break-inside: avoid;margin-bottom: 24rpx;}
@@ -24,20 +43,35 @@
 .waterfall .item-info{font-size: 24rpx;padding: 0 20rpx;}
 .waterfall .item-info .price{color: #f60;margin-right: 5rpx;}
 .waterfall .item-info .addr{color: #666;} */
-.indexproduct.data-v-57280228{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-flex-wrap: wrap;flex-wrap: wrap;}
-.indexproduct .item-wrap.data-v-57280228{width: 50%;margin-bottom: 22rpx;}
-.indexproduct .item-wrap .item.data-v-57280228{box-shadow: 0px 0px 14px -4px rgba(0, 0, 0, 0.3);border-radius: 18rpx;}
-.indexproduct .item-wrap:nth-child(odd) .item.data-v-57280228{margin-right: 11rpx;}
-.indexproduct .item-wrap:nth-child(even) .item.data-v-57280228{margin-left: 11rpx;}
-.indexproduct .item-img-wrap.data-v-57280228{overflow: hidden;width: 100%;height: 322rpx;margin-bottom: 15rpx;border-top-left-radius: 18rpx;border-top-right-radius: 18rpx;}
-.indexproduct .item-img.data-v-57280228{width: 100%;height: 100%;}
-.indexproduct .item-text-wrap.data-v-57280228{padding:  0 24rpx 25rpx;padding-right: 0;box-sizing: border-box;height: 192rpx;}
-.indexproduct .merchant.data-v-57280228{line-height: 33rpx;margin-bottom: 5rpx;color: #6BBC6D;}
-.indexproduct .merchant .postage.data-v-57280228{height: 24rpx;padding: 0 14rpx;margin-left: 16rpx;line-height: 24rpx;display: inline-block;font-size: 20rpx;background-color: #E1F2E2;border-radius: 12rpx;}
-.indexproduct .item-til.data-v-57280228{font-size: 32rpx;font-weight: 500;color: #333;line-height: 45rpx;margin-bottom: 5rpx;}
-.indexproduct .item-addr.data-v-57280228{font-size: 24rpx;font-weight: 400;color: #666;line-height: 33rpx;margin-bottom: 5rpx;}
-.indexproduct .item-price-info .rmb.data-v-57280228{font-size: 28rpx;font-weight: 500;color: #FF5030;line-height: 40rpx;}
-.indexproduct .item-price-info .price.data-v-57280228{font-size: 36rpx;font-weight: 500;color: #FF5030;line-height: 50rpx;}
-.indexproduct .item-price-info .unit.data-v-57280228{font-size: 24rpx;font-weight: 400;color: #999999;line-height: 33rpx;}
+.indexproduct{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-flex-wrap: wrap;flex-wrap: wrap;}
+.indexproduct .item-wrap{width: 50%;margin-bottom: 22rpx;}
+.indexproduct .item-wrap .item{-webkit-box-shadow: 0px 0px 14px -4px rgba(0, 0, 0, 0.3);box-shadow: 0px 0px 14px -4px rgba(0, 0, 0, 0.3);-webkit-border-radius: 18rpx;border-radius: 18rpx;}
+.indexproduct .item-wrap:nth-child(odd) .item{margin-right: 11rpx;}
+.indexproduct .item-wrap:nth-child(even) .item{margin-left: 11rpx;}
+.indexproduct .item-img-wrap{overflow: hidden;width: 100%;height: 322rpx;margin-bottom: 12rpx;-webkit-border-top-left-radius: 18rpx;border-top-left-radius: 18rpx;-webkit-border-top-right-radius: 18rpx;border-top-right-radius: 18rpx;}
+.indexproduct .item-img{width: 100%;height: 100%;}
+.indexproduct .item-text-wrap{padding:  0 24rpx 25rpx;padding-right: 0;-webkit-box-sizing: border-box;box-sizing: border-box;height: 150rpx;}
+.indexproduct .merchant{line-height: 33rpx;color: #6BBC6D;font-size: 24rpx;}
+.indexproduct .merchant .postage{height: 24rpx;padding: 0 14rpx;margin-left: 16rpx;line-height: 24rpx;display: inline-block;font-size: 20rpx;background-color: #E1F2E2;-webkit-border-radius: 12rpx;border-radius: 12rpx;}
+.indexproduct .item-til{font-size: 32rpx;font-weight: 500;color: #333;line-height: 45rpx;}
+.indexproduct .item-addr{font-size: 24rpx;font-weight: 400;color: #666;line-height: 33rpx;margin-bottom: 5rpx;}
+.indexproduct .item-price-info .rmb{font-size: 28rpx;font-weight: 500;color: #FF5030;line-height: 40rpx;}
+.indexproduct .item-price-info .price{font-size: 36rpx;font-weight: 500;color: #FF5030;line-height: 50rpx;}
+.indexproduct .item-price-info .price.noprice{font-size: 28rpx;}
+.indexproduct .item-price-info .unit{font-size: 24rpx;font-weight: 400;color: #999999;line-height: 33rpx;}
+.index .u-notice-bar-wrap .iconfont{color: #feaa36;}
+.index .uni-popup .fade-out:first-of-type{background-color: rgba(0, 0, 0, 0.75)!important;}
+.uni-popup{z-index: 999;}
+.promotion{width: 100vw;position: relative;text-align: center;}
+.promotion .image{width:625rpx;height: 962rpx;display: block;margin: 0 auto 32rpx;}
+.close-wrap{}
+.promotion .imgclose{width: 60rpx;height: 60rpx;}
+/* .supplier-list{padding: 0 16rpx 24rpx;} */
+.suppliers{display: -webkit-box;display: -webkit-flex;display: flex;}
+.supplier-list-item{-webkit-flex-shrink: 0;flex-shrink: 0;width: 142rpx;margin-right: 20rpx;display: inline-block;}
+.supplier-list-item-img{display: block;width: 100%;height: 108rpx;margin-bottom: 7rpx;}
+.supplier-list-item-img .img{width: 100%;height: 100%;}
+.supplier-list-item-til{font-size: 24rpx;color: #666;line-height: 33rpx;height: 64rpx;overflow: hidden;}
+.rollbuy{position: absolute;top: 89rpx;left: 0;height: 54rpx;line-height: 54rpx;background-color: rgba(0,0,0,0.47);color: #fff;-webkit-border-top-right-radius: 50rpx;border-top-right-radius: 50rpx;-webkit-border-bottom-right-radius: 50rpx;border-bottom-right-radius: 50rpx;font-size: 24rpx;padding: 0 30rpx 0 16rpx;}
 
 

unpackage/dist/dev/mp-weixin/pages/login/login.wxss

@@ -1,20 +1,5 @@
 
-page.data-v-b237504c{background-color: #f8f8f8;}
-.til.data-v-b237504c{margin: 24rpx 0;}
-.login.data-v-b237504c{padding-top: 24rpx;}
-.uni-input.data-v-b237504c{width: 100%;box-sizing: border-box;border-radius:100rpx;background-color: #fff;height: 50px;padding-left: 80rpx;}
-.uni-form-item.data-v-b237504c{position: relative;margin-bottom: 40rpx;}
-.btn.data-v-b237504c{border-radius: 100rpx;}
-.uni-form-item-wrap.data-v-b237504c{margin-bottom:  80rpx;}
-.eyebtn.data-v-b237504c {position: absolute;height: 100%; width: 50px;top: 0; right: 0;background: transparent;cursor: pointer;border: 0;padding: 0;margin: 0;outline: 0;}
-.eyebtn.data-v-b237504c::before,
-.eyebtn.data-v-b237504c::after {content:'';position: absolute;top: 0; left: 0; bottom: 0; right: 0;margin: auto;}
-.eyebtn.data-v-b237504c::after{-webkit-transform-origin:unset;transform-origin:unset;-webkit-transform: scale(0.8);transform: scale(0.8);}
-.eyebtn.password.data-v-b237504c::before {width: 20px;height: 20px;background: #e0e0e0;border-radius: 15px 0 15px 0;-webkit-transform: rotate(45deg);transform: rotate(45deg);-webkit-transition: height .168s;transition: height .168s;}
-.eyebtn.password.data-v-b237504c::after {width: 10px;height: 10px;border-radius: 50%;background: #424242;}
-.eyebtn.text.data-v-b237504c::before {width: 15px;height: 15px;background: transparent;border: 3px solid #e0e0e0;border-radius: 15px 0 15px 0;-webkit-transform: rotate(45deg);transform: rotate(45deg);}
-.eyebtn.text.data-v-b237504c::after {width: 3px;height: 30px;border-radius: 0;-webkit-transform: rotate(30deg);transform: rotate(30deg);background: #e0e0e0;-webkit-transition: height .132s;transition: height .132s;}
-.wxlogin.data-v-b237504c{height: 100rpx;}
-.wxlogin-btn.data-v-b237504c{position: fixed;left: 50%;bottom: 50rpx;width: 100rpx;height: 100rpx;margin-left: -50rpx;background-color: #007AFF;border-radius: 50%;}
-.wxlogin-btn .wxlogin-icon.data-v-b237504c{width: 100%;height: 100%;-webkit-transform: scale(0.5);transform: scale(0.5);}
+page.data-v-b237504c{background: #fff;}
+.loginbg.data-v-b237504c{width: 100%;height: auto;margin: 80rpx 0 40rpx;}
+.big-btn.data-v-b237504c{margin: 0 95rpx;background-color: #65B74E;-webkit-border-radius: 100rpx;border-radius: 100rpx;color: #fff;font-size: 32rpx;font-weight: 400;line-height: 45rpx;letter-spacing: 5rpx;}
 

unpackage/dist/dev/mp-weixin/pages/product/product.json

@@ -1,4 +1,8 @@
 {
   "navigationBarTitleText": "贵州林产品-产品详情",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-popup": "/components/uni-popup/uni-popup",
+    "uni-popup-dialog": "/components/uni-popup/uni-popup-dialog",
+    "quick-buy": "/pages/product/modal/quickBuy"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/product/product.wxss

@@ -1,2 +1,43 @@
-
+page{background-color: #F6F7F8;}
+.wrap{margin:0 24rpx;}
+.product-info-wrap{background-color: #fff;padding: 24rpx 40rpx 46rpx;margin-bottom: 24rpx;}
+.product-info-til{margin-bottom: 13rpx;font-size: 32rpx;font-weight: 500;color: #333333;line-height: 45rpx;font-weight: bold;}
+.product-info-brand{margin-bottom: 8rpx;font-size: 24rpx;font-weight: 400;color: #6BBC6D;line-height: 33rpx;}
+.product-info-brand .postage{margin-left: 16rpx;padding: 2rpx 14rpx;-webkit-border-radius: 24rpx;border-radius: 24rpx;font-size: 20rpx;font-weight: 400;color: #6BBC6D;line-height: 28rpx;background-color: #E1F2E2;}
+.product-info-item{/* display: flex; */-webkit-box-align: center;-webkit-align-items: center;align-items: center;-webkit-box-pack: justify;-webkit-justify-content: space-between;justify-content: space-between;margin-bottom: 8rpx;font-size: 26rpx;font-weight: 400;color: #999;line-height: 37rpx;}
+.product-info-item .item{margin-bottom: 10rpx;margin-right: 20rpx;}
+.product-info-price{font-size: 24rpx;font-weight: 400;color: #999;line-height: 33rpx;}
+.product-info-price .rmb{margin-right: 10rpx;font-size: 28rpx;font-weight: 500;color: #FF5030;line-height: 40rpx;}
+.product-info-price .price{font-size: 36rpx;font-weight: 500;color: #FF5030;line-height: 50rpx;}
+.product-info-price .price.noprice{font-size: 28rpx;}
+.block-til{display: -webkit-box;display: -webkit-flex;display: flex;margin-bottom: 24rpx;-webkit-box-pack: justify;-webkit-justify-content: space-between;justify-content: space-between;-webkit-box-align: center;-webkit-align-items: center;align-items: center;height: 90rpx;border-bottom: 1px solid #eee;}
+.block-til-left{font-size: 30rpx;font-weight: bold;line-height: 42rpx;color: #333;}
+.block-til-right{font-weight: 400;color: #6BBC6D;line-height: 33px;}
+.placeoforigin-info{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-align: center;-webkit-align-items: center;align-items: center;}
+.placeoforigin-info-img-wrap{width: 240rpx;height: 240rpx;overflow: hidden;margin-right: 24rpx;text-align: center;}
+.placeoforigin-info-img{width: 100%;height: 100%;}
+.placeoforigin-info-text{-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;font-weight: 400;}
+.placeoforigin-info-text-til{font-size: 34rpx;line-height: 48rpx;color: #333;}
+.placeoforigin-info-text-con{font-size: 28rpx;color: #999;line-height: 40rpx;}
+.placeoforigin-info-text-product{overflow : hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 5;-webkit-box-orient: vertical;}
+.placeoforigin-addr{font-size: 34rpx;font-weight: 400;color: #6BBC6D;line-height: 48rpx;}
+.introduce{margin-bottom: 24rpx;}
+.introduce-table{display: -webkit-box;display: -webkit-flex;display: flex;margin-bottom: 24rpx;}
+.introduce-table-til{font-size: 30rpx;font-weight: 400;color: #333;line-height: 42px;margin-right: 25rpx;}
+.introduce-table-con{-webkit-box-flex:1;-webkit-flex:1;flex:1;background-color: #FAFAFA;border: 1px solid #E8E8E8;border-bottom: 0;font-size: 20rpx;color: #666;}
+.introduce-table-row{display: -webkit-box;display: -webkit-flex;display: flex;border-bottom: 1px solid #E8E8E8;}
+.introduce-table-col{-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;padding: 19rpx 0;text-align: center;}
+.introduce-table-col + .introduce-table-col{border-left: 1px solid #E8E8E8;}
+.page-article-text{font-size: 24rpx;font-weight: 400;color: #999;line-height: 33rpx;}
+.page-article ._p{text-indent: 2em;margin-bottom: 8rpx;}
+.safe-icon{width: 36rpx;height: 36rpx;margin-right: 10rpx;display: inline-block;vertical-align: -10rpx;}
+.safe-icon-img{width: 100%;height: 100%;}
+.bottom-flex-btn{border: 0;}
+.bottom-flex-btn::after{border: 0;}
+.recommend-list{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-pack: justify;-webkit-justify-content: space-between;justify-content: space-between;-webkit-flex-wrap: wrap;flex-wrap: wrap;}
+.recommend-list::after{content: '';width: 200rpx;}
+.recommend-item{margin-bottom: 24rpx;width: 200rpx;height: 308rpx;overflow: hidden;-webkit-box-shadow: 0px 0px 14rpx -4rpx rgba(0, 0, 0, 0.12);box-shadow: 0px 0px 14rpx -4rpx rgba(0, 0, 0, 0.12);-webkit-border-radius: 12rpx;border-radius: 12rpx;}
+.recommend-item-img{width: 100%;height: 160rpx;}
+.recommend-item-til{padding: 0 13rpx;margin-bottom: 4rpx;font-size: 24rpx;color: #333;line-height: 33rpx;height: 66rpx;overflow: hidden;}
+.recommend-list .product-info-price{padding: 0 9rpx;}
 

unpackage/dist/dev/mp-weixin/pages/producttype/producttype.wxss

@@ -1,20 +1,10 @@
-.producttype-wrap.data-v-7852205a .uni-searchbar__box{-webkit-box-pack: left;-webkit-justify-content: left;justify-content: left;border-color: #6BBC6D;border-radius: 50rpx!important;background-color: #fff!important;}
+.producttype-wrap.data-v-7852205a .uni-searchbar__box{-webkit-box-pack: left;-webkit-justify-content: left;justify-content: left;border-color: #6BBC6D;-webkit-border-radius: 50rpx!important;border-radius: 50rpx!important;background-color: #fff!important;}
 .producttype-wrap.data-v-7852205a .uni-searchbar{padding-left: 0;}
 .producttype.data-v-7852205a{display: -webkit-box;display: -webkit-flex;display: flex;background: #fff;}
-.producttype-nav.data-v-7852205a{width: 200rpx;height: 100%;box-sizing: border-box;background-color: #F6F6F9;overflow-y: auto;}
-.producttype-nav-item.data-v-7852205a{position: relative;padding: 29rpx 0;box-sizing: border-box;text-align: center;font-size: 30rpx;font-weight: 500;color: #333;line-height: 42rpx;}
+.producttype-nav.data-v-7852205a{width: 200rpx;height: 100%;-webkit-box-sizing: border-box;box-sizing: border-box;background-color: #F6F6F9;overflow-y: auto;position: fixed;left: 0;bottom: 0;top: calc(44px + env(safe-area-inset-top));}
+.producttype-nav-item.data-v-7852205a{position: relative;padding: 29rpx 0;-webkit-box-sizing: border-box;box-sizing: border-box;text-align: center;font-size: 30rpx;font-weight: 500;color: #333;line-height: 42rpx;}
 .producttype-nav-item.active.data-v-7852205a{background-color: #fff;color: #6BBC6D;}
-.producttype-nav-item.active.data-v-7852205a::before{content: '';position: absolute;left: 0;top: 50%;margin-top: -15rpx;width: 6rpx;height: 30rpx;background: #6BBC6D;border-radius: 3px;}
-.producttype-con.data-v-7852205a{position: relative;-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;margin: 0 0 0 22rpx;padding-top: 20rpx;}
-.search-typelist-item.data-v-7852205a{display: -webkit-box;display: -webkit-flex;display: flex;margin-left: 22rpx;height: 84rpx;-webkit-box-align: center;-webkit-align-items: center;align-items: center;border-bottom: 1px solid #eee;}
-.search-typelist-item-serial.data-v-7852205a{margin-right: 24rpx;padding: 5rpx 13rpx;min-width: 35rpx;text-align: center;background-color: #6BBC6D;color: #fff;}
-.search-typelist-item-name.data-v-7852205a{font-size: 24rpx;}
-/* 
-.producttype-con-block{padding: 24rpx;margin-bottom: 20rpx;border: 1px solid #ddd;border-radius: 10rpx;}
-.producttype-con-block-til{margin-bottom: 10rpx;}
-.producttype-con-block-con{display: flex;flex-direction: row;flex-wrap: wrap;}
-.producttype-con-block-item{width: 31%;margin: 0 1% 10rpx;box-sizing: border-box;padding: 0 10rpx;text-align: center;}
-.producttype-con-block-noimg .producttype-con-block-item{border: 1px solid #ddd;padding: 10rpx;}
-.producttype-con-block-con-img{height: 200rpx;width: 100%;}
- */
+.producttype-nav-item.active.data-v-7852205a::before{content: '';position: absolute;left: 0;top: 50%;margin-top: -15rpx;width: 6rpx;height: 30rpx;background: #6BBC6D;-webkit-border-radius: 3px;border-radius: 3px;}
+.producttype-con.data-v-7852205a{position: relative;-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;margin: 0 0 0 237rpx;-webkit-box-sizing: border-box;box-sizing: border-box;height: 100%;overflow-y: auto;}
+.producttype-wrap .product-wrap.data-v-7852205a{margin: 0;}
 

unpackage/dist/dev/mp-weixin/pages/publish/chosetype.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "贵州林产品-我要发布",
-  "usingComponents": {}
-}

unpackage/dist/dev/mp-weixin/pages/publish/chosetype.wxss

@@ -1,116 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/* @import url("./chosetype.css"); */
-

unpackage/dist/dev/mp-weixin/pages/publish/publish.json

@@ -1,4 +1,7 @@
 {
   "navigationBarTitleText": "贵州林产品-发布商品",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-search-bar": "/components/uni-search-bar/uni-search-bar",
+    "mescroll-body": "/components/mescroll-uni/mescroll-body"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/publish/publishsuccess/publishsuccess.wxml

@@ -1 +1 @@
-<view class="pages data-v-4dca9b74"></view>
+<view class="pages data-v-4dca9b74"><view class="tip-icon-wrap data-v-4dca9b74"><image class="tip-icon data-v-4dca9b74" src="/static/img/icon-success.png" mode></image></view><view class="tip-text data-v-4dca9b74">操作成功</view><view class="tip-sub data-v-4dca9b74">商品已发布成功，请等待后台审核</view><navigator class="big-btn primary data-v-4dca9b74" url="/pages/index/index" open-type="switchTab">返回主页</navigator></view>

unpackage/dist/dev/mp-weixin/pages/publish/publishsuccess/publishsuccess.wxss

@@ -24,6 +24,12 @@
 
 
 
+
+
+
+
+
+
 
 
 
@@ -32,4 +38,9 @@
 
 
 /* @import url("./publishsuccess.css"); */
+page.data-v-4dca9b74{background-color: #fff;}
+.tip-icon-wrap.data-v-4dca9b74{text-align: center;}
+.tip-icon.data-v-4dca9b74{width: 128rpx;height: 128rpx;margin-top: 64rpx;margin-bottom: 40rpx;}
+.tip-text.data-v-4dca9b74{margin-bottom: 16rpx;font-size: 36rpx;font-weight: 400;color: #333;line-height: 50rpx;text-align: center;}
+.tip-sub.data-v-4dca9b74{margin-bottom: 104rpx;min-height: 74rpx;font-size: 26rpx;font-weight: 400;color: #999;line-height: 37rpx;text-align: center;}
 

unpackage/dist/dev/mp-weixin/pages/publish/publishtype/publishtype.wxss

@@ -1,10 +1,10 @@
-.producttype-wrap.data-v-7d2a86cc .uni-searchbar__box{-webkit-box-pack: left;-webkit-justify-content: left;justify-content: left;border-color: #6BBC6D;border-radius: 50rpx!important;background-color: #fff!important;}
+.producttype-wrap.data-v-7d2a86cc .uni-searchbar__box{-webkit-box-pack: left;-webkit-justify-content: left;justify-content: left;border-color: #6BBC6D;-webkit-border-radius: 50rpx!important;border-radius: 50rpx!important;background-color: #fff!important;}
 .producttype-wrap.data-v-7d2a86cc .uni-searchbar{padding-left: 0;}
 .producttype.data-v-7d2a86cc{display: -webkit-box;display: -webkit-flex;display: flex;background: #fff;}
-.producttype-nav.data-v-7d2a86cc{width: 200rpx;height: 100%;box-sizing: border-box;background-color: #F6F6F9;overflow-y: auto;}
-.producttype-nav-item.data-v-7d2a86cc{position: relative;padding: 29rpx 0;box-sizing: border-box;text-align: center;font-size: 30rpx;font-weight: 500;color: #333;line-height: 42rpx;}
+.producttype-nav.data-v-7d2a86cc{width: 200rpx;height: 100%;-webkit-box-sizing: border-box;box-sizing: border-box;background-color: #F6F6F9;overflow-y: auto;}
+.producttype-nav-item.data-v-7d2a86cc{position: relative;padding: 29rpx 0;-webkit-box-sizing: border-box;box-sizing: border-box;text-align: center;font-size: 30rpx;font-weight: 500;color: #333;line-height: 42rpx;}
 .producttype-nav-item.active.data-v-7d2a86cc{background-color: #fff;color: #6BBC6D;}
-.producttype-nav-item.active.data-v-7d2a86cc::before{content: '';position: absolute;left: 0;top: 50%;margin-top: -15rpx;width: 6rpx;height: 30rpx;background: #6BBC6D;border-radius: 3px;}
+.producttype-nav-item.active.data-v-7d2a86cc::before{content: '';position: absolute;left: 0;top: 50%;margin-top: -15rpx;width: 6rpx;height: 30rpx;background: #6BBC6D;-webkit-border-radius: 3px;border-radius: 3px;}
 .producttype-con.data-v-7d2a86cc{position: relative;-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;margin: 0 0 0 22rpx;padding-top: 20rpx;}
 .search-typelist-item.data-v-7d2a86cc{display: -webkit-box;display: -webkit-flex;display: flex;margin-left: 22rpx;height: 84rpx;-webkit-box-align: center;-webkit-align-items: center;align-items: center;border-bottom: 1px solid #eee;}
 .search-typelist-item-serial.data-v-7d2a86cc{margin-right: 24rpx;padding: 5rpx 13rpx;min-width: 35rpx;text-align: center;background-color: #6BBC6D;color: #fff;}

unpackage/dist/dev/mp-weixin/pages/searchresults/searchresults.wxss

@@ -1,10 +1,15 @@
-.results-item.data-v-2c5f29e4{display: -webkit-box;display: -webkit-flex;display: flex;margin-bottom: 24rpx;}
-.results-item-img-wrap.data-v-2c5f29e4{width: 220rpx;height: 220rpx;margin-right: 24rpx;overflow: hidden;border-radius: 12rpx;}
-.results-item-img-wrap .results-item-img.data-v-2c5f29e4{width: 100%;height: 100%;}
-.results-item-info-til.data-v-2c5f29e4{margin-bottom: 10rpx;}
-.results-item-info-addr.data-v-2c5f29e4{color: #666;margin-bottom: 10rpx;font-size: 24rpx;}
-.results-item-info-label .postage.data-v-2c5f29e4{height: 24rpx;padding: 0 14rpx;margin-left: 16rpx;line-height: 24rpx;display: inline-block;font-size: 20rpx;background-color: #E1F2E2;border-radius: 12rpx;}
-.results-item-info-price .rmb.data-v-2c5f29e4{font-size: 28rpx;font-weight: 500;color: #FF5030;line-height: 40rpx;}
-.results-item-info-price .price.data-v-2c5f29e4{font-size: 36rpx;font-weight: 500;color: #FF5030;line-height: 50rpx;}
-.results-item-info-price .minsell.data-v-2c5f29e4{font-size: 24rpx;font-weight: 400;color: #999999;line-height: 33rpx;}
+/* 搜索修改 */
+.search-wrap.data-v-2c5f29e4{padding: 10rpx 8rpx;background-color: #fff;}
+.search-wrap.data-v-2c5f29e4 .uni-searchbar__box{-webkit-box-pack: left;-webkit-justify-content: left;justify-content: left;border: 0;background-color: #F1F1F2!important;}
+/* .results-item{display: flex;margin-bottom: 24rpx;border-bottom: 1px solid #eee;}
+.results-item-img-wrap{width: 220rpx;height: 220rpx;margin-right: 24rpx;overflow: hidden;border-radius: 12rpx;}
+.results-item-img-wrap .results-item-img{width: 100%;height: 100%;}
+.results-item-info{flex: 1;}
+.results-item-info-til{margin-bottom: 10rpx;}
+.results-item-info-brand{color: #999;margin-bottom: 10rpx;}
+.results-item-info-addr{color: #666;margin-bottom: 10rpx;font-size: 24rpx;}
+.results-item-info-label .postage{height: 24rpx;padding: 0 14rpx;margin-left: 16rpx;line-height: 24rpx;display: inline-block;font-size: 20rpx;background-color: #E1F2E2;border-radius: 12rpx;}
+.results-item-info-price .rmb{font-size: 28rpx;font-weight: 500;color: #FF5030;line-height: 40rpx;}
+.results-item-info-price .price{font-size: 36rpx;font-weight: 500;color: #FF5030;line-height: 50rpx;}
+.results-item-info-price .minsell{font-size: 24rpx;font-weight: 400;color: #999999;line-height: 33rpx;} */
 

unpackage/dist/dev/mp-weixin/pages/usercenter/authentication/authentication.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "贵州林产品-实名认证",
+  "navigationBarTitleText": "贵州林产品-企业认证",
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/usercenter/authentication/authentication.wxss

@@ -18,6 +18,228 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

unpackage/dist/dev/mp-weixin/pages/usercenter/feedback/feedback.wxss

@@ -15,9 +15,11 @@
 	width:100%;
 	height:500rpx;
 	background:rgba(248,248,248,1);
-	border-radius:28rpx;
+	-webkit-border-radius:28rpx;
+	        border-radius:28rpx;
 	padding:20rpx;
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	        box-sizing: border-box;
 }
 .feedback .tel .title.data-v-ecf36d4e{
 	font-size:28rpx;
@@ -26,11 +28,13 @@
 	line-height:40px;
 }
 .feedback .tel .uni-input.data-v-ecf36d4e{
-	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	        box-sizing: border-box;
 	width:100%;
 	height:110rpx;
 	background:rgba(248,248,248,1);
-	border-radius:24rpx;
+	-webkit-border-radius:24rpx;
+	        border-radius:24rpx;
 	padding:3rpx 30rpx;
 }
 .feedback .tel .uni-input.data-v-ecf36d4e::-webkit-input-placeholder{color: #D4D4D4;}
@@ -39,6 +43,7 @@ button.data-v-ecf36d4e{
 	height: 88rpx;
 	line-height: 88rpx;
 	background-color: #65B74E;
-	border-radius: 44rpx;
+	-webkit-border-radius: 44rpx;
+	        border-radius: 44rpx;
 }
 

unpackage/dist/dev/mp-weixin/pages/usercenter/myfocus/myfocus.json

@@ -1,4 +1,8 @@
 {
-  "navigationBarTitleText": "贵州林产品-我的关注",
-  "usingComponents": {}
+  "navigationBarTitleText": "我有意向的",
+  "usingComponents": {
+    "uni-swipe-action": "/components/uni-swipe-action/uni-swipe-action",
+    "mescroll-body": "/components/mescroll-uni/mescroll-body",
+    "uni-swipe-action-item": "/components/uni-swipe-action-item/uni-swipe-action-item"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/usercenter/myfocus/myfocus.wxss

@@ -31,5 +31,175 @@
 
 
 
-/* @import url("./myfocus.css"); */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* @import url("./mypublish.css"); */
+/* .product-item{display: block;} */
 

unpackage/dist/dev/mp-weixin/pages/usercenter/usercenter.json

@@ -1,4 +1,5 @@
 {
-  "navigationBarTitleText": "贵州林产品-个人中心",
+  "navigationBarTitleText": "我的",
+  "navigationStyle": "custom",
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/usercenter/usercenter.wxss

@@ -1,35 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/* @import url("./usercenter.css"); */
+.myinfo-wrap.data-v-80b07974{background-color: #fff;padding-bottom: 24rpx;margin-bottom: 24rpx;}
+.myinfo.data-v-80b07974{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-align: center;-webkit-align-items: center;align-items: center;margin: 0 24rpx 24rpx;padding: 24rpx 0;border-bottom: 1px solid #eee;}
+.myinfo-photo.data-v-80b07974{width: 120rpx;height: 120rpx;margin-right: 24rpx;-webkit-border-radius: 50%;border-radius: 50%;overflow: hidden;}
+.myinfo-photo-img.data-v-80b07974{width: 100%;height: 100%;}
+.myinfo-text-name.data-v-80b07974{font-size: 36rpx;font-weight: 400;color: #333;line-height: 50rpx;margin-bottom: 4rpx;}
+.myinfo-text-identity.data-v-80b07974{font-size: 30rpx;font-weight: 400;color: #999;line-height: 42rpx;}
+.myinfo-focus.data-v-80b07974{display: -webkit-box;display: -webkit-flex;display: flex;-webkit-box-align: center;-webkit-align-items: center;align-items: center;}
+.myinfo-focus-item.data-v-80b07974{-webkit-box-flex: 1;-webkit-flex: 1;flex: 1;text-align: center;}
+.myinfo-focus-item .number.data-v-80b07974{font-size: 50rpx;font-weight: 400;line-height: 70rpx;}
+.myinfo-focus-item .text.data-v-80b07974{font-size: 26rpx;font-weight: 400;color: #999;line-height: 37rpx;}
+.myinfo-focus-myfocus .number.data-v-80b07974{color: #6BBC6D;}
+.myinfo-focus-focusme .number.data-v-80b07974{color: #F5A623;}
 

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,52 +1,56 @@
 {
-	"description": "项目配置文件。",
-	"packOptions": {
-		"ignore": []
-	},
-	"setting": {
-		"urlCheck": false,
-		"es6": true,
-		"postcss": true,
-		"preloadBackgroundData": false,
-		"minified": true,
-		"newFeature": true,
-		"coverView": true,
-		"autoAudits": false,
-		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"checkInvalidKey": true,
-		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		},
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
-	},
-	"compileType": "miniprogram",
-	"libVersion": "",
-	"appid": "touristappid",
-	"projectname": "forest",
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
-	"condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
-		"game": {
-			"current": -1,
-			"list": []
-		},
-		"miniprogram": {
-			"current": -1,
-			"list": []
-		}
-	}
+  "description": "项目配置文件。",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": true,
+    "coverView": true,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "useMultiFrameRuntime": false,
+    "useApiHook": true,
+    "bundle": false
+  },
+  "compileType": "miniprogram",
+  "libVersion": "",
+  "appid": "touristappid",
+  "projectname": "forest",
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "condition": {
+    "search": {
+      "list": []
+    },
+    "conversation": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": []
+    }
+  }
 }

unpackage/dist/dev/mp-weixin/static/iconfont/demo_index.html

@@ -30,6 +30,84 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe63d;</span>
+                <div class="name">后退</div>
+                <div class="code-name">&amp;#xe63d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe662;</span>
+                <div class="name">加</div>
+                <div class="code-name">&amp;#xe662;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe663;</span>
+                <div class="name">减</div>
+                <div class="code-name">&amp;#xe663;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65f;</span>
+                <div class="name">地质</div>
+                <div class="code-name">&amp;#xe65f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe660;</span>
+                <div class="name">风云榜</div>
+                <div class="code-name">&amp;#xe660;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe661;</span>
+                <div class="name">更多</div>
+                <div class="code-name">&amp;#xe661;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65e;</span>
+                <div class="name">保(3)</div>
+                <div class="code-name">&amp;#xe65e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65d;</span>
+                <div class="name">企业认证</div>
+                <div class="code-name">&amp;#xe65d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65c;</span>
+                <div class="name">加号</div>
+                <div class="code-name">&amp;#xe65c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65b;</span>
+                <div class="name">我的订单</div>
+                <div class="code-name">&amp;#xe65b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65a;</span>
+                <div class="name">Group</div>
+                <div class="code-name">&amp;#xe65a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe659;</span>
+                <div class="name">帮助</div>
+                <div class="code-name">&amp;#xe659;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe658;</span>
+                <div class="name">电话</div>
+                <div class="code-name">&amp;#xe658;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe657;</span>
                 <div class="name">商品</div>
@@ -146,6 +224,123 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont iconhoutui"></span>
+            <div class="name">
+              后退
+            </div>
+            <div class="code-name">.iconhoutui
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconjia"></span>
+            <div class="name">
+              加
+            </div>
+            <div class="code-name">.iconjia
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconjian"></span>
+            <div class="name">
+              减
+            </div>
+            <div class="code-name">.iconjian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icondizhi1"></span>
+            <div class="name">
+              地质
+            </div>
+            <div class="code-name">.icondizhi1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconfengyunbang"></span>
+            <div class="name">
+              风云榜
+            </div>
+            <div class="code-name">.iconfengyunbang
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icongengduo"></span>
+            <div class="name">
+              更多
+            </div>
+            <div class="code-name">.icongengduo
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconbao3"></span>
+            <div class="name">
+              保(3)
+            </div>
+            <div class="code-name">.iconbao3
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconwodetuandui"></span>
+            <div class="name">
+              企业认证
+            </div>
+            <div class="code-name">.iconwodetuandui
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconjiahao"></span>
+            <div class="name">
+              加号
+            </div>
+            <div class="code-name">.iconjiahao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconwodedingdan"></span>
+            <div class="name">
+              我的订单
+            </div>
+            <div class="code-name">.iconwodedingdan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconGroup"></span>
+            <div class="name">
+              Group
+            </div>
+            <div class="code-name">.iconGroup
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconbangzhu"></span>
+            <div class="name">
+              帮助
+            </div>
+            <div class="code-name">.iconbangzhu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icondianhua"></span>
+            <div class="name">
+              电话
+            </div>
+            <div class="code-name">.icondianhua
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont iconshangpin"></span>
             <div class="name">
@@ -274,6 +469,110 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconhoutui"></use>
+                </svg>
+                <div class="name">后退</div>
+                <div class="code-name">#iconhoutui</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconjia"></use>
+                </svg>
+                <div class="name">加</div>
+                <div class="code-name">#iconjia</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconjian"></use>
+                </svg>
+                <div class="name">减</div>
+                <div class="code-name">#iconjian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icondizhi1"></use>
+                </svg>
+                <div class="name">地质</div>
+                <div class="code-name">#icondizhi1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconfengyunbang"></use>
+                </svg>
+                <div class="name">风云榜</div>
+                <div class="code-name">#iconfengyunbang</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icongengduo"></use>
+                </svg>
+                <div class="name">更多</div>
+                <div class="code-name">#icongengduo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconbao3"></use>
+                </svg>
+                <div class="name">保(3)</div>
+                <div class="code-name">#iconbao3</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconwodetuandui"></use>
+                </svg>
+                <div class="name">企业认证</div>
+                <div class="code-name">#iconwodetuandui</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconjiahao"></use>
+                </svg>
+                <div class="name">加号</div>
+                <div class="code-name">#iconjiahao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconwodedingdan"></use>
+                </svg>
+                <div class="name">我的订单</div>
+                <div class="code-name">#iconwodedingdan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconGroup"></use>
+                </svg>
+                <div class="name">Group</div>
+                <div class="code-name">#iconGroup</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconbangzhu"></use>
+                </svg>
+                <div class="name">帮助</div>
+                <div class="code-name">#iconbangzhu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icondianhua"></use>
+                </svg>
+                <div class="name">电话</div>
+                <div class="code-name">#icondianhua</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#iconshangpin"></use>

unpackage/dist/dev/mp-weixin/static/iconfont/iconfont.json

@@ -5,6 +5,97 @@
   "css_prefix_text": "icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "16162443",
+      "name": "后退",
+      "font_class": "houtui",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "18205013",
+      "name": "加",
+      "font_class": "jia",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "18205014",
+      "name": "减",
+      "font_class": "jian",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "18205009",
+      "name": "地质",
+      "font_class": "dizhi1",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "18205010",
+      "name": "风云榜",
+      "font_class": "fengyunbang",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "18205011",
+      "name": "更多",
+      "font_class": "gengduo",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "16978183",
+      "name": "保(3)",
+      "font_class": "bao3",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "16956711",
+      "name": "企业认证",
+      "font_class": "wodetuandui",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "16954762",
+      "name": "加号",
+      "font_class": "jiahao",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "16944010",
+      "name": "我的订单",
+      "font_class": "wodedingdan",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "16943964",
+      "name": "Group",
+      "font_class": "Group",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "16943937",
+      "name": "帮助",
+      "font_class": "bangzhu",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "16943906",
+      "name": "电话",
+      "font_class": "dianhua",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
     {
       "icon_id": "16915549",
       "name": "商品",