diff --git a/App.vue b/App.vue index 73d3155fe87b8acc227095ee212ced98100cf8e4..e2f82fc31bad98d9cca812d2ae051d7997885989 100644 --- a/App.vue +++ b/App.vue @@ -14,5 +14,12 @@ </script> <style> - /*æ¯ä¸ªé¡µé¢å…¬å…±css */ + /*æ¯ä¸ªé¡µé¢å…¬å…±css */ + .unlogin_price{ + font-size: 26rpx; + color: #999999; + height: 44rpx; + line-height: 44rpx; + text-align: left; + } </style> diff --git a/manifest.json b/manifest.json index 4f19896f76248ae1e7a4a61e085ae5cf86d58041..cf767183a457affafbb721b0753958c8b4614466 100644 --- a/manifest.json +++ b/manifest.json @@ -62,7 +62,7 @@ "disableHostCheck": true, "proxy": { "/uni/api": { - "target": "http://192.168.50.133:6564/", + "target": "http://192.168.1.2:9093/", "changeOrigin": true, "secure": false, "pathRewrite": { diff --git a/pages/search/search.vue b/pages/search/search.vue index 1f2eefcd1a7658d81047b2c1f4505451ea581733..196c104a8dbe65bfbe287758881af499094cd10e 100644 --- a/pages/search/search.vue +++ b/pages/search/search.vue @@ -12,7 +12,7 @@ <view class="search-condition_item" :class="{current: param.label === 'default'}" @click="tabClick('default')"> <text>ç»¼åˆæŽ’åº</text> <view class="icon_tips"> - <text :class="{active: param.order === 'asc' && param.label === 'default'}" class="yticon xia"></text> + <text :class="{active: param.order === 'asc' && param.label === 'default'}" class="yticon"></text> <text :class="{active: param.order === 'desc' && param.label === 'default'}" class="yticon"></text> </view> </view> @@ -49,7 +49,8 @@ </view> <view class="title">{{item._source.goods_name}}</view> <view class="sub-title">{{item._source.goods_subname}}</view> - <view class="price"><text class="price-tips">ï¿¥</text>{{item._source.price}}</view> + <view v-if="!isLogin" class="price"><text class="price-tips">ï¿¥</text>{{item._source.price}}</view> + <view v-if="isLogin" class="unlogin_price">ç™»å½•æ˜¾ç¤ºä»·æ ¼</view> <!-- <view class="old-price"><text class="price-tips">ï¿¥</text>30.00</view> --> <image class="cart-icon" @click="addCart(item._source.default_spec, 1)" src="https://dbc-static.oss-cn-beijing.aliyuncs.com/credit_shop/global/icon_gouwuche%402x.png"></image> </view> @@ -122,7 +123,7 @@ }, methods: { backHome(){ - uni.redirectTo({ + uni.reLaunch({ url: '/pages/home/home' }) }, @@ -169,6 +170,7 @@ this.goods_list = []; } this.goods_list = this.goods_list.concat(data.data); + this.isLogin = data.login_flg === 1; const {total, page_size, current} = data.page; this.param.current = current; //åˆ¤æ–æ˜¯å¦è¿˜æœ‰ä¸‹ä¸€é¡µï¼Œæœ‰æ˜¯more,没有是nomore