OA单的优化

yvan.ni
1 parent b41021e3
Showing 15 changed files with 140 additions and 47 deletions
app.js
components/com_top_nav/com_top_nav.js
components/com_top_nav/com_top_nav.wxml
components/diy_top_nav/diy_top_nav.js
components/diy_top_nav/diy_top_nav.wxml
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/presell/cardInfo/goodsInfo.wxml
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
pages/giftpack/giftpacklist/giftpacklist.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -51,7 +51,7 @@ App({
         config: null,   //门店参数
         config2: null,  //门店配置
         code: null,
-        user_id:null,//6520352
+        user_id:null,//6520491,// 6519913,//6520352
         // user_id:6520314,// qa-6519858,//
         // user_id:14148118,// qa-6519858,//
         buy_now: null,
@@ -75,6 +75,7 @@ App({
         sp_scene: null,
         navBarHeight:44,    //默认高度44
+        is_pc:0,  //是不是在pc端打开小程序
     },
     auth: o,
     request: a,
@@ -202,7 +203,16 @@ App({
                 if (modelmes && modelmes.indexOf('iPhone X') != -1) {　　//XS,XR,XS MAX均可以适配,因为indexOf()会将包含'iPhone X'的字段都查出来
                     this.globalData.isIpx = true
                 }
-                this.globalData.navBarHeight = 44 + res.statusBarHeight
+
+                /*-- 判断是不是PC端打开的 */
+                if (res && ["windows", "mac"].some((v) => v === res["platform"])) {
+                    app.globalData.is_pc=1;
+                    this.globalData.navBarHeight =0
+                }else{
+                    this.globalData.navBarHeight = 44 + res.statusBarHeight
+                }
+
+
             },
         })
         this.globalData.menuInfo = wx.getMenuButtonBoundingClientRect() || {}
@@ -1636,6 +1646,8 @@ App({
        }
        a.wxParse(content, "html", ut.format_content(ob.text), th, 6);
        e.wxParseAddFullImageUrl(th, content);
+
+    
    },
    async deal_iframe_next(ob){
@@ -19,7 +19,8 @@ Component({
     height:0,
     h1:0,
     h2:0,
-    user_id:0
+    user_id:0,
+    is_pc:0
   },
   ready: function() {
       let height= getApp().globalData.navBarHeight;
@@ -30,6 +31,9 @@ Component({
       }
       //-- 胶囊的高度 --
       this.setData({height,h1:menuInfo.top,h2:menuInfo.height,user_no});
+      if(getApp().globalData.is_pc){
+          this.setData({is_pc:1})
+      }
   },
   pageLifetimes: {
         //要处理一下，游客登录后的界面的变化,主要还该是改变会员
 <!-- 需要cover-view是大转盘才会 -->
+<block wx:if="{{!is_pc}}">
+
 <block wx:if="{{need_cover}}">
     <cover-view class="t_nav" style="height:{{height}}px;background-color:{{bcolor}};color:{{color}}">
         <cover-view class="tab" style="height:{{h1}}px;">
@@ -31,4 +33,6 @@
 <!-- 用于顶开层的高 -->
-<view style="height:{{height}}px"></view>
 \ No newline at end of file
+<view style="height:{{height}}px"></view>
+
+</block>
 \ No newline at end of file
@@ -65,43 +65,51 @@ Component({
       //   img:'',
       //   url:'' 
       // },
-    ]
+    ],
+    is_pc:0
   },
   lifetimes:{
     attached:function(){
-      //满屏顶部导航参数获取-----------
-      try {
-        let systemInfo = wx.getSystemInfoSync()
-        let mentButt = wx.getMenuButtonBoundingClientRect()
-        let nav_pb = mentButt.top - systemInfo.statusBarHeight
-        let navleft_pb = systemInfo.windowWidth - mentButt.right
-        let user_no='';
-        if(getApp().globalData.userInfo){
-          user_no=getApp().globalData.userInfo.erpvipno
-        }
+       var is_pc=getApp().globalData.is_pc;
+       if(!is_pc) {
+
+        //满屏顶部导航参数获取-----------
+        try {
+          let systemInfo = wx.getSystemInfoSync()
+          let mentButt = wx.getMenuButtonBoundingClientRect()
+          let nav_pb = mentButt.top - systemInfo.statusBarHeight
+          let navleft_pb = systemInfo.windowWidth - mentButt.right
+
+          let user_no = '';
+          if (getApp().globalData.userInfo) {
+            user_no = getApp().globalData.userInfo.erpvipno
+          }
-        this.setData({
-          nav_h:mentButt.top,
-          mentButt_h:mentButt.height,
-          nav_left_w:mentButt.left,
-          navleft_pb,
-          nav_pb,
-          navleft_w:mentButt.width*0.9,
-          user_no
-        })
-      } catch (e) {
-        console.error(e);
-        wx.showToast({
-          title: '系统参数获取失败',
-          icon: 'none',
-          duration: 2000
-        })
-        // this.setData({
-        //   is_full_screen_navigation:false
-        // })
-        // Do something when catch error
-      }
+          this.setData({
+            nav_h: mentButt.top,
+            mentButt_h: mentButt.height,
+            nav_left_w: mentButt.left,
+            navleft_pb,
+            nav_pb,
+            navleft_w: mentButt.width * 0.9,
+            user_no
+          })
+        } catch (e) {
+          console.error(e);
+          wx.showToast({
+            title: '系统参数获取失败',
+            icon: 'none',
+            duration: 2000
+          })
+          // this.setData({
+          //   is_full_screen_navigation:false
+          // })
+          // Do something when catch error
+        }
+      }else{
+          this.setData({is_pc:1});
+       }
     }
   },
   /**
 <!--components/diy_top_nav/diy_top_nav.wxml-->
 <!-- 支撑作用 -->
+<block wx:if="{{!is_pc}}">
+
 <view wx:if="{{nav_type==-1}}" style="padding-bottom:{{nav_pb}}px;color: {{nav_frontColor}};">
   <view  style="height: {{nav_h}}px;width: 100%;"></view>
   <view style="width: 100%;height:{{mentButt_h}}px;line-height:{{mentButt_h}}px;text-align: center;"></view>
 </view>
+
+
 <!-- 默认没有返回按钮 -->
 <view wx:if="{{nav_type==0}}" style="padding-bottom:{{nav_pb}}px;background-color:{{nav_backgroundColor}};color: {{nav_frontColor}};">
   <view  style="height: {{nav_h}}px;width: 100%;"></view>
@@ -67,3 +71,5 @@
     <view class="nav_right">1212121</view>
   </view>
 </view>
+
+</block>
 \ No newline at end of file
@@ -15,7 +15,7 @@
 					 nav_frontColor="{{nav_frontColor}}" istop="{{(istop && searchbox_transparent && activeCategoryId==0)  ? 1 : 0 }}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{gtitle}}"></top_nav>
 		</view>
-		<view class="type-navbar" style="top:{{top_nav-4}}px">
+		<view class="type-navbar" style="top:{{top_nav?(top_nav-4):0}}px">
 			<view class="type-box" wx:for="{{categories}}" wx:key="categories">
 				<view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
 					{{item.name}}
@@ -17,7 +17,7 @@
 					 nav_frontColor="{{nav_frontColor}}" istop="{{(istop && searchbox_transparent && activeCategoryId==0)  ? 1 : 0 }}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{gtitle}}"></top_nav>
 		</view>
-		<view class="type-navbar" style="top:{{top_nav-4}}px">
+		<view class="type-navbar" style="top:{{top_nav?(top_nav-4):0}}px">
 			<view class="type-box" wx:for="{{categories}}" wx:key="categories">
 				<view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
 					{{item.name}}
@@ -495,7 +495,14 @@ Page({
       //------几人评价-------
       //n.init(th, "", "comments");
-      if(e && e.goods_bottomconent){
+      if(e && e.goods_topconent && e.goods_ad_position.indexOf('1')>-1){
+        //商品详情广告----
+        a.wxParse("goodInfo_ad2", "html", ut.format_content(e.goods_topconent), ee, 6);
+        common.wxParseAddFullImageUrl(ee, "goodInfo_ad2");
+        //-------
+      }
+
+      if(e && e.goods_bottomconent && e.goods_ad_position.indexOf('2')>-1){
         //商品详情广告----
         a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
         common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
@@ -20,7 +20,7 @@
     </view>
 	  <!-- tab选项卡 -->
-    <view class="type-navbar" style="top:{{top_nav-4}}px">
+    <view class="type-navbar" style="top:{{(top_nav?top_nav-4);0}}px">
       <view class="type-box" wx:for="{{categories}}" wx:key="categories">
         <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">{{item.name}}</view>
       </view>
@@ -681,6 +681,10 @@
               </view>
             </view>
           </view>
+          <!-- 详情广告顶部-->
+          <view class="wxParse">
+            <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
+          </view>
           <!-- 详情图片 -->
           <view class="wxParse">
             <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
@@ -689,6 +693,7 @@
           <view class="wxParse">
             <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
           </view>
+
         </view>
         <!-- 推荐商品 -->
         <view class="flex-center rel xc-linellae-frame">
@@ -768,6 +773,12 @@
             </view>
           </view>
         </view>
+
+        <!-- 详情广告顶部-->
+        <view class="wxParse">
+          <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
+        </view>
+
         <view class="wxParse">
           <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
@@ -16,7 +16,7 @@
     <top_nav id="my-nav" bindclickShare="clickShare" nav_type="{{nav_type}}" is_share="1"
              nav_frontColor="{{nav_frontColor}}" istop="{{(istop && searchbox_transparent && activeCategoryId==0)  ? 1 : 0 }}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{gtitle}}"></top_nav>
   </view>
-  <view class="type-navbar" style="top:{{top_nav-4}}px">
+  <view class="type-navbar" style="top:{{top_nav?(top_nav-4):0}}px">
     <view class="type-box" wx:for="{{categories}}" wx:key="categories">
       <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
         {{item.name}}
@@ -423,7 +423,14 @@ Page({
       });
-      if(e && e.goods_bottomconent){
+      if(e && e.goods_topconent && e.goods_ad_position.indexOf('1')>-1){
+        //商品详情广告----
+        a.wxParse("goodInfo_ad2", "html", ut.format_content(e.goods_topconent), ee, 6);
+        common.wxParseAddFullImageUrl(ee, "goodInfo_ad2");
+        //-------
+      }
+
+      if(e && e.goods_bottomconent && e.goods_ad_position.indexOf('2')>-1){
         //商品详情广告----
         a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
         common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
@@ -19,7 +19,7 @@
              nav_frontColor="{{nav_frontColor}}" istop="{{(istop && searchbox_transparent && activeCategoryId==0)  ? 1 : 0 }}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{gtitle}}"></top_nav>
   </view>
-  <view class="type-navbar" style="top:{{top_nav-4}}px">
+  <view class="type-navbar" style="top:{{top_nav?(top_nav-4):0}}px">
     <view class="type-box" wx:for="{{categories}}" wx:key="categories">
       <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
         {{item.name}}
@@ -346,14 +346,21 @@
             </view>
           </view>
         </view>
+
+        <!-- 详情广告顶部-->
+        <view class="wxParse">
+          <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
+        </view>
+
         <!-- 详情图片 -->
         <view class="wxParse">
           <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
-        <!-- 详情广告 -->
+        <!-- 详情广告底部 -->
         <view class="wxParse">
           <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
         </view>
+
       </view>
       <!-- 推荐商品 -->
       <view class="flex-center rel xc-linellae-frame">
@@ -440,6 +447,13 @@
           </view>
         </view>
       </view>
+
+
+      <!-- 详情广告顶部-->
+      <view class="wxParse">
+        <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
+      </view>
+
       <view class="wxParse">
         <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
       </view>
@@ -526,7 +526,8 @@ Page({
             data: {
                 "storeId": a.stoid, //商家ID
                 "userId": d.user_id, //用户ID
-                "giftBagId": th.getGiftID
+                "giftBagId": th.getGiftID,
+                isnNewUserLb:1
             },
             success: function success(res) {
                 if (res.data.code == 0) {
@@ -517,8 +517,15 @@ Page({
             // goods_bottomconent:e.goods_bottomconent
           });
+          if(e && e.goods_topconent && e.goods_ad_position.indexOf('1')>-1){
+            //商品详情广告----
+            a.wxParse("goodInfo_ad2", "html", ut.format_content(e.goods_topconent), ee, 6);
+            common.wxParseAddFullImageUrl(ee, "goodInfo_ad2");
+            //-------
+          }
+
           //判断商品详情要有东西
-          if(e && e.goods_bottomconent) {
+          if(e && e.goods_bottomconent && e.goods_ad_position.indexOf('2')>-1) {
             //商品详情广告----
             a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
             common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
@@ -22,7 +22,7 @@
                    nav_frontColor="{{nav_frontColor}}" istop="{{(istop && searchbox_transparent && activeCategoryId==0)  ? 1 : 0 }}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{gtitle}}"></top_nav>
     </view>
-    <view class="type-navbar" style="top:{{top_nav-4}}px" wx:if="{{activeCategoryId>0 || !istop || ( istop && !searchbox_transparent)}}" >
+    <view class="type-navbar" style="top:{{top_nav?(top_nav-4):0}}px" wx:if="{{activeCategoryId>0 || !istop || ( istop && !searchbox_transparent)}}" >
       <view class="type-box" wx:for="{{categories}}" wx:key="id">
         <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">{{item.name}}</view>
       </view>
@@ -878,6 +878,12 @@
               </view>
             </view>
           </view>
+
+          <!-- 详情广告顶部-->
+          <view class="wxParse">
+            <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
+          </view>
+
           <!-- 详情图片 -->
           <view class="wxParse">
             <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
@@ -965,6 +971,12 @@
             </view>
           </view>
         </view>
+
+        <!-- 详情广告顶部-->
+        <view class="wxParse">
+          <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
+        </view>
+
         <view class="wxParse">
           <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>