更新

components/WaterfallsFlowItem/WaterfallsFlowItem.vue

@@ -213,9 +213,9 @@
   }
 
   .wf-page0 .name {
-    color: #282828;
+    color: #000;
     margin: 20rpx 0 10rpx 0;
-    font-size: 13px;
+    font-size: 30rpx;
     overflow: hidden;
     text-overflow: ellipsis;
     display: -webkit-box;
@@ -245,7 +245,7 @@
 
   .wf-page1 .wf-item {
     .name {
-      font-size: 13px;
+      font-size: 30rpx;
       overflow: hidden;
       text-overflow: ellipsis;
       display: -webkit-box;
@@ -433,8 +433,8 @@
 
   .store_info {
     width: 100%;
-    font-size: 20rpx;
+    font-size: 22rpx;
-    color: #aaa;
+    color: #333;
     white-space: pre-wrap;
     font-weight: 400;
     display: -webkit-box;

config/app.js

@@ -15,19 +15,32 @@ let openPlantGrass = '-openPlantGrass-'
 
 let httpSix, httpApi;
 
-const env = 'dev'
+// const env = 'dev'; // 开发
+const env = 'prod'; // 生产
+// const env = 'prew'; // 预上线
 
-// 网络接口修改此字符 小程序域名要求https
+switch (env) {
-// httpApi = 'http://192.168.31.106:8324' //测试
+	case 'prod':
-// httpApi = 'https://test.shop.lihaink.cn' //生产
+		httpApi = 'https://shop.lihaink.cn' // 生产
-httpApi = 'https://crmeb-test.shop.lihaink.cn' //生产
+		httpSix = 'https://new-worker.lihaink.cn'
+		wsApi = 'wss://shop.lihaink.cn'
+		break;
+	case 'prew':
+		httpApi = 'https://test.shop.lihaink.cn' //预发布环境
+		httpSix = 'https://ceshi-new-wokr.lihaink.cn'
+		wsApi = 'wss://test.shop.lihaink.cn'
+		break;
+	default:
+		httpApi = "https://crmeb-test.shop.lihaink.cn" // 测试
+		httpSix = 'https://ceshi-new-wokr.lihaink.cn'
+		wsApi = 'wss://crmeb-test.shop.lihaink.cn'
+}
 
-httpSix = 'https://ceshi-new-wokr.lihaink.cn'
 // httpSix = 'https://new-worker.lihaink.cn'
 
 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
 // let wsApi = 'ws://192.168.3.20:8324'
-let wsApi = 'wss://mer1.crmeb.net'
+// let wsApi = 'wss://mer1.crmeb.net'
 
 module.exports = {
 	// 请求域名 格式： https://您的域名
@@ -39,7 +52,8 @@ module.exports = {
 
 	// #ifdef H5
 	//H5接口是浏览器地址
-	HTTP_REQUEST_URL: httpApi || window.location.protocol + "//" + window.location.host,
+	HTTP_REQUEST_URL: process.env.NODE_ENV == 'development' ? httpApi : window.location.protocol + "//" + window
+		.location.host,
 	// 聊天长连接地址
 	VUE_APP_WS_URL: wsApi ? `${wsApi}?type=user` : VUE_APP_WS_URL,
 	// #endif

manifest.json

@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "2.0.08",
+    "versionName" : "2.0.09",
-    "versionCode" : 2008,
+    "versionCode" : 2009,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/index/component/homeComb.vue

@@ -23,7 +23,7 @@
 		</view>
 
 		<!--轮播图-->
-		<view class="swiperBg" :style="{ marginTop: (swiperTop + 10)+'px'}">
+		<view class="swiperBg" :style="{ marginTop: (swiperTop + 13)+'px'}">
 			<view class="swiper page_swiper" v-if="imgUrls.length">
 				<swiper :autoplay="true" :circular="circular" :interval="intervals" :duration="duration"
 					indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff" :current="swiperCur"

pages/order_addcart/order_addcart.vue

@@ -133,11 +133,11 @@
 					<image :src="`${domain}/static/images/noCart.png`"></image>
 					<view>暂无商品，去添加点什么吧</view>
 				</view>
-				<recommend v-if="recommend_switch == 1" :hostProduct='hostProduct' :isLogin="isLogin" :sale_type="tabsCurr"></recommend>
+				<!-- <recommend v-if="recommend_switch == 1" :hostProduct='hostProduct' :isLogin="isLogin" :sale_type="tabsCurr"></recommend>
 				<view class='loadingicon acea-row row-center-wrapper'
 					v-if="hostProduct.length>5 && recommend_switch == 1">
 					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-				</view>
+				</view> -->
 			</view>
 			<view class='footer acea-row row-between-wrapper' :class="{on : isFooter}" v-if="cartList.valid.length > 0">
 				<view>

pages/store/home/index.vue

@@ -1674,7 +1674,7 @@
           .name_text {
             display: inline-block;
             max-width: 340rpx;
-            font-size: 26rpx;
+            font-size: 29rpx;
             color: #262626;
           }
 
@@ -1704,9 +1704,8 @@
           align-items: center;
           width: 100%;
           // margin-bottom: 28rpx;
-          font-size: 18rpx;
+          font-size: 22rpx;
-          line-height: 26rpx;
+          line-height: 28rpx;
-          max-height: 78rpx;
           color: #999999;
           display: -webkit-box;
           -webkit-box-orient: vertical;