소스 검색

feat:屏蔽内容

jinx 3 년 전
부모
커밋
15a25f6fb5
4개의 변경된 파일18개의 추가작업 그리고 15개의 파일을 삭제
  1. 6 6
      config.js
  2. 7 5
      pages/goods/goods.wxml
  3. 1 0
      pages/goods/goods.wxss
  4. 4 4
      pages/ucenter/orderDetail/orderDetail.js

+ 6 - 6
config.js

@@ -16,12 +16,12 @@ const mal = {
   env: 'pro',
   socketHost: 'wss://shop.4dkankan.com',
   // socketHost: 'wss://192.168.0.79:3031',
-  requestHost: 'https://plaza-cszfb.4dkankan.com', // 测试环境
-  viewChildHost: 'https://cszfb.4dkankan.com', //测试环境
-  viewHost: 'https://cszfb.4dkankan.com'//测试环境
-  // requestHost: 'https://plaza.4dkankan.com',
-  // viewChildHost: 'https://zfb.4dkankan.com',
-  // viewHost: 'https://zfb.4dkankan.com'
+  // requestHost: 'https://plaza-cszfb.4dkankan.com', // 测试环境
+  // viewChildHost: 'https://cszfb.4dkankan.com', //测试环境
+  // viewHost: 'https://cszfb.4dkankan.com'//测试环境
+  requestHost: 'https://plaza.4dkankan.com',
+  viewChildHost: 'https://zfb.4dkankan.com',
+  viewHost: 'https://zfb.4dkankan.com'
 }
 
 

+ 7 - 5
pages/goods/goods.wxml

@@ -1,4 +1,5 @@
-<scroll-view class="container" style="height: {{winHeight}}rpx" scroll-y="true">
+<!-- <scroll-view class="container" style="height: {{winHeight}}rpx" scroll-y="true"> -->
+<scroll-view class="container" scroll-y="true">
   <auth bindlogin="onShow" />
 	
   <view wx:if="{{!openAttr}}">
@@ -18,7 +19,8 @@
           <text class="price">¥{{goods.retail_price}}</text>
           <view class="brand" wx:if="{{brand.name}}">
           <!-- <navigator hover-class="none" open-type="{{isfromBrand?'navigateBack':'redirect'}}" hover-class="none" url="../brandDetail/brandDetail?id={{brand.id}}"> -->
-          <navigator hover-class="none" hover-class="none" url="../brandDetail/brandDetail?id={{brand.id}}">
+          <!-- <navigator hover-class="none" hover-class="none" url="../brandDetail/brandDetail?id={{brand.id}}"> -->
+          <navigator hover-class="none" hover-class="none" url="">
             <text style="background-image: url()">{{brand.name}}</text>
             <image src="/static/images/icon-normal_detailTagArrow.png"></image>
           </navigator>
@@ -151,10 +153,10 @@
 </scroll-view>
 
 <!-- {{isiPhoneX ? 'isIPx' : ''}} -->
-<view class="bottom-btn {{isiPhoneX ? 'isIPx' : ''}}" >
+<!-- <view class="bottom-btn {{isiPhoneX ? 'isIPx' : ''}}" >
   <view class="l l-collect {{ openAttr ? 'back' : ''}}" bindtap="closeAttrOrCollect">
     <image class="icon" src="{{ collectBackImage }}"></image>
-  </view>
+  </view> -->
   <!-- <view class="l l-cart">
     <view class="box">
       <text class="cart-count" wx:if="{{cartGoodsCount > 0}}">{{cartGoodsCount}}</text>
@@ -168,7 +170,7 @@
   加入购物车
   </view>
   <view class="c {{checkGoods.goods_number === 0 ? 'disbuy' : ''}}" bindtap='buyGoods'>立即购买</view> -->
-</view>
+<!-- </view> -->
 
 
 <lip-sync />

+ 1 - 0
pages/goods/goods.wxss

@@ -1,5 +1,6 @@
 .container {
     /* margin-bottom: 100rpx; */
+    padding-bottom: 20rpx;
 }
 
 .goodsimgs {

+ 4 - 4
pages/ucenter/orderDetail/orderDetail.js

@@ -30,10 +30,10 @@ Page({
   },
 
   gotoBrand:function(e){
-    // let {id} = e.currentTarget.dataset
-    // wx.navigateTo({
-    //   url: '/pages/brandDetail/brandDetail?id=' + id
-    // })
+    let {id} = e.currentTarget.dataset
+    wx.navigateTo({
+      url: '/pages/brandDetail/brandDetail?id=' + id
+    })
   },
 
   getOrderDetail() {