bug fi

App.vue

@@ -15,4 +15,8 @@
 
 <style>
 	@import './static/iconfont.css';
+	.uni-input-input {
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
 </style>

manifest.json

@@ -62,7 +62,7 @@
       "disableHostCheck": true,
       "proxy": {
         "/uni/api": {
-          "target": "http://39.96.85.45:9093/",
+          "target": "http://192.168.50.133:6564/",
           "changeOrigin": true,
           "secure": false,
           "pathRewrite": {

pages/category/category.vue

@@ -62,6 +62,9 @@
 			}
 		},
 		onLoad(option) {
+			uni.showLoading({
+			    title: '加载中'
+			});
 			this.firsr_cate_id = option.cate_id_1;
 			option.current = Number(option.current);
 			option.page_size = Number(option.page_size);
@@ -108,6 +111,7 @@
 						this.page = page;
 						this.isLogin  = res.data.login_flg;
 						this.is_city = res.data.city_flg;
+						uni.hideLoading();
 					}
 				});
 			},

pages/detail/detail.vue

@@ -63,6 +63,9 @@
 			}
 		},
 		onLoad(option) {
+			uni.showLoading({
+			    title: '加载中'
+			});
 			this.getData({
 				current: 1,
 				page_size: 10
@@ -108,6 +111,7 @@
 						this.page = page;
 						this.isLogin  = res.data.login_flg;
 						this.is_city = res.data.city_flg;
+						uni.hideLoading();
 					}
 				});
 			},

pages/home/components/goodslist.vue

@@ -79,7 +79,8 @@
 			if(goods_data_type === 3) {
 				list = goods_list;
 			} else if (goods_data_type === 1) {
-				list = additional_goods_show ? cate_goods_list.concat(goods_list).slice(0,goods_num) : cate_goods_list
+				let cgl = buy_goods_list || [];
+				list = additional_goods_show ? cgl.concat(goods_list).slice(0,goods_num) : cgl
 			} else {
 				let bgl = buy_goods_list || [];
 				list = additional_goods_show ? bgl.concat(goods_list).slice(0,goods_num) : bgl
@@ -113,6 +114,7 @@
 	}
 	.goods_content, .swiper_content {
 		border-radius: 0 0 16rpx 16rpx;
+		margin-bottom: 20rpx;
 	}
 	.goods_box, .goods_box2 {
 		display: flex;

pages/home/components/hotrecommd.vue

@@ -11,13 +11,13 @@
 				</view>
 			</view>
 			<view class="hot_cate_list">
-				<text class="hot_cate_item" v-for="(item, key) in cate_list" :key="key" @click="changeCate(key)" :class="key === hotIndex ? 'act' : ''" >{{item.cate_name}}</text>
+				<text class="hot_cate_item" v-for="(item, key) in cate_list" :key="key" @click="changeCate(key)" :class="key === hotIndex ? 'act' : ''" v-if="item.goods_list instanceof Array">{{item.cate_name}}</text>
 			</view>
 		</view>
 		<view v-for="(val, key) in cate_list" :key="key" v-if="key === hotIndex">
 			<view v-if="val.goods_list" class="flex_goods">
 				<view class="hot_goods_item" v-for="(item, index) in val.goods_list" :key="index">
-					<image class="hot_goods_icon" :src="style_setting.angle_sign_url"></image>
+					<image class="hot_goods_icon" v-if="style_setting.angle_sign" :src="style_setting.angle_sign_url"></image>
 					<image class="hot_goods_img" :src="item.default_image || $noGoodsImg" @click="$jumpGoodDetail(item.goods_id)"></image>
 					<text class="hot_goods_name" v-if="style_setting.title_show">{{item.goods_name}}</text>
 					<text class="hot_goods_subname" v-if="style_setting.sub_title_show">{{item.goods_subname || '　'}}</text>

pages/home/components/searchbar.vue

@@ -86,9 +86,6 @@
 		.search_input {
 			height: 60rpx;
 			font-size: 28rpx;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
 		}
 		.login_btn {
 			width: 92rpx;

pages/index/index.vue

@@ -113,6 +113,9 @@
 			}
 		},
 		onLoad() {
+			uni.showLoading({
+			    title: '加载中'
+			});
 			this.getData();
 			// #ifdef H5
 			//默认请求微信分享
@@ -163,6 +166,7 @@
 						if(res.data.data.portrait) {
 							this.portrait = res.data.data.portrait;
 						}
+						uni.hideLoading();
 					}
 				})
 			},