merge wjw_dev

manifest.json

@@ -2,7 +2,7 @@
   "name": "shop_mobile_uni",
   "appid": "__UNI__F904656",
   "description": "",
-  "versionName": "1.0.5",
+  "versionName": "1.0.6",
   "versionCode": "100",
   "transformPx": false,
   "app-plus": {
@@ -51,7 +51,7 @@
       "mode": "history",
       "base": "/uni"
     },
-    "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/mirror/1.0.5/",
+    "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/mirror/1.0.6/",
     "optimization": {
       "treeShaking": {
         "enable": true
@@ -62,7 +62,7 @@
       "disableHostCheck": true,
       "proxy": {
         "/uni/api": {
-          "target": "http://192.168.50.133:6564/",
+          "target": "http://39.96.85.45:9093/",
           "changeOrigin": true,
           "secure": false,
           "pathRewrite": {

package-lock.json

 {
   "name": "shop_mobile_uni",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -28,4 +28,5 @@
     "jweixin-module": "^1.6.0",
     "moment": "^2.24.0"
   }
+	
 }

pages/search/search.vue

@@ -40,7 +40,7 @@
 			</view>
 		</view>
 		<!-- 空白页 -->
-		<empty v-if="goods_list.length === 0" title='暂无商品数据'></empty>
+		<empty v-if="goods_list.length === 0" title=''></empty>
 		<!-- 商品列表 -->
 		<view class="goods-list" v-if="goods_list.length > 0">
 			<view class="goods-item" v-for="(item,index) in goods_list" :key="index">
@@ -414,5 +414,8 @@
 		}
 	}
 }
+.unlogin_price{
+	font-size: 30rpx;
+}
 
 </style>