joe преди 4 години
родител
ревизия
6a1c175505
променени са 4 файла, в които са добавени 54 реда и са изтрити 92 реда
  1. 1 1
      view/xcx/pages/goods_details/index.js
  2. 40 83
      view/xcx/pages/index/index.wxml
  3. 12 8
      view/xcx/pages/user_spread_money/index.js
  4. 1 0
      view/xcx/utils/wxh.js

+ 1 - 1
view/xcx/pages/goods_details/index.js

@@ -986,7 +986,7 @@ Page({
     },
     
     /**
-     * 用户点击右上角分享
+     * 用户点击分享
      */
     onShareAppMessage: function () {
         var that = this;

+ 40 - 83
view/xcx/pages/index/index.wxml

@@ -12,11 +12,9 @@
             <view class="wrapper">
                 <!-- banner 图 -->
                 <view class="slider-banner banner">
-                    <swiper indicator-dots="true" autoplay="{{autoplay}}" circular="{{circular}}" interval="3000"
-                        duration="500" indicator-color="rgba(0,0,0,0.2)" indicator-active-color="#ff3366">
+                    <swiper indicator-dots="true" autoplay="{{autoplay}}" circular="{{circular}}" interval="3000" duration="500" indicator-color="rgba(0,0,0,0.2)" indicator-active-color="#ff3366">
                         <swiper-item wx:for="{{banner}}" wx:key='index'>
-                            <navigator url="{{item.url ? item.url : ''}}" class="pictrue acea-row row-middle"
-                                hover-class='none'>
+                            <navigator url="{{item.url ? item.url : ''}}" class="pictrue acea-row row-middle" hover-class='none'>
                                 <image src="{{item.pic}}" class="slide-image"></image>
                             </navigator>
                         </swiper-item>
@@ -26,8 +24,7 @@
                 <!-- 菜单按钮 -->
                 <view class="nav acea-row">
                     <block wx:for="{{menus}}" wx:key='index'>
-                        <navigator url="{{item.url ? item.url : ''}}" wx:if="{{item.show == '1'}}" class="item"
-                            open-type='switchTab' hover-class='none'>
+                        <navigator url="{{item.url ? item.url : ''}}" wx:if="{{item.show == '1'}}" class="item" open-type='switchTab' hover-class='none'>
                             <view class="pictrue">
                                 <image src="{{item.pic}}"></image>
                             </view>
@@ -48,20 +45,17 @@
                         <image src='/images/news.png'></image>
                     </view>
                     <view class='swiperTxt'>
-                        <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="2500"
-                            duration="{{duration}}" vertical="true" circular="true">
+                        <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="2500" duration="{{duration}}" vertical="true" circular="true">
                             <block wx:for="{{itemNew}}" wx:key='index'>
                                 <swiper-item catchtouchmove='catchTouchMove'>
-                                    <navigator wx:if="{{item.show == '1'}}" url='{{item.url}}' open-type='switchTab'
-                                        class='acea-row row-between-wrapper' hover-class='none'>
+                                    <navigator wx:if="{{item.show == '1'}}" url='{{item.url}}' open-type='switchTab' class='acea-row row-between-wrapper' hover-class='none'>
                                         <view class='text acea-row row-between-wrapper'>
                                             <view class='label border2' wx:if="{{item.id < 5 }}">最新</view>
                                             <view class='newsTitle line1'>{{item.info}}</view>
                                         </view>
                                         <!-- <view class='iconfont icon-xiangyou'></view> -->
                                     </navigator>
-                                    <navigator wx:else open-type='navigate' url='{{item.url}}'
-                                        class='acea-row row-between-wrapper' hover-class='none'>
+                                    <navigator wx:else open-type='navigate' url='{{item.url}}' class='acea-row row-between-wrapper' hover-class='none'>
                                         <view class='text acea-row row-between-wrapper'>
                                             <view class='label border2' wx:if="{{item.id%2 == 0}}">最新</view>
                                             <view class='newsTitle line1'>{{item.info}}</view>
@@ -137,33 +131,23 @@
                         <navigator hover-class="none" url='/pages/first-new-product/index?type=3' class="more">更多 >
                         </navigator>
                     </view>
-                    <navigator wx:if='{{liveInfo.roomid}}' hover-class="none"
-                        url="plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id={{liveInfo.roomid}}"
-                        class="broadcast time">
+                    <navigator wx:if='{{liveInfo.roomid}}' hover-class="none" url="plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id={{liveInfo.roomid}}" class="broadcast time">
                         <view class="pictrue">
                             <image src="{{liveInfo.share_img}}"></image>
-                            <view class="label" wx:if='{{liveInfo.live_status == 101}}'><text
-                                    class="iconfont icon-zhibo"></text>直播中</view>
-                            <view class="label" wx:if='{{liveInfo.live_status == 103}}'><text
-                                    class="iconfont icon-zhibojieshux"></text>已结束</view>
-                            <view class="label" wx:if='{{liveInfo.live_status == 102}}'><text
-                                    class="iconfont icon-shijian"></text>直播时间 {{liveInfo._start_time}}</view>
+                            <view class="label" wx:if='{{liveInfo.live_status == 101}}'><text class="iconfont icon-zhibo"></text>直播中</view>
+                            <view class="label" wx:if='{{liveInfo.live_status == 103}}'><text class="iconfont icon-zhibojieshux"></text>已结束</view>
+                            <view class="label" wx:if='{{liveInfo.live_status == 102}}'><text class="iconfont icon-shijian"></text>直播时间 {{liveInfo._start_time}}</view>
                         </view>
                         <view class="text line1">{{liveInfo.name}}</view>
                     </navigator>
                     <view class="list" wx:if="{{liveList.length}}">
                         <scroll-view class="scroll-view_x" scroll-x style="width:auto;overflow:hidden;">
-                            <navigator hover-class="none" wx:for='{{liveList}}' wx:key='index'
-                                url="plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id={{item.roomid}}"
-                                class="item">
+                            <navigator hover-class="none" wx:for='{{liveList}}' wx:key='index' url="plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id={{item.roomid}}" class="item">
                                 <view class="pictrue">
                                     <image src="{{item.share_img}}"></image>
-                                    <view class="label" wx:if='{{item.live_status == 101}}'><text
-                                            class="iconfont icon-zhibo"></text>直播中</view>
-                                    <view class="label" wx:if='{{item.live_status == 103}}'><text
-                                            class="iconfont icon-zhibojieshux"></text>已结束</view>
-                                    <view class="label" wx:if='{{item.live_status == 102}}'><text
-                                            class="iconfont icon-shijian"></text>直播时间 {{item._start_time}}</view>
+                                    <view class="label" wx:if='{{item.live_status == 101}}'><text class="iconfont icon-zhibo"></text>直播中</view>
+                                    <view class="label" wx:if='{{item.live_status == 103}}'><text class="iconfont icon-zhibojieshux"></text>已结束</view>
+                                    <view class="label" wx:if='{{item.live_status == 102}}'><text class="iconfont icon-shijian"></text>直播时间 {{item._start_time}}</view>
                                 </view>
                                 <view class="text line1">{{item.name}}</view>
                             </navigator>
@@ -259,19 +243,13 @@
                     </view>
                     <!-- 首发新品轮播图 -->
                     <view class="newSwiper">
-                        <swiper autoplay="{{autoplay}}" circular="{{circular}}" interval="{{intervalNew}}"
-                            duration="{{durationNew}}" previous-margin="110px" next-margin="110px"
-                            bindchange="bindchange">
+                        <swiper autoplay="{{autoplay}}" circular="{{circular}}" interval="{{intervalNew}}" duration="{{durationNew}}" previous-margin="110px" next-margin="110px" bindchange="bindchange">
                             <swiper-item wx:for="{{info.firstList}}" wx:key='index'>
-                                <view bindtap="goDetailType" data-items='{{item}}'
-                                    class="item {{avtiveIndex===index?'active':'quiet'}}">
+                                <view bindtap="goDetailType" data-items='{{item}}' class="item {{avtiveIndex===index?'active':'quiet'}}">
                                     <image src="{{item.image}}" mode="widthFix"></image>
-                                    <text class="pictrue_log_medium pictrue_log_class"
-                                        wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
-                                    <text class="pictrue_log_medium pictrue_log_class"
-                                        wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
-                                    <text class="pictrue_log_medium pictrue_log_class"
-                                        wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
+                                    <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
+                                    <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
+                                    <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
                                 </view>
                             </swiper-item>
                         </swiper>
@@ -295,11 +273,9 @@
                     </view>
                     <!-- 精品推荐配图轮播 -->
                     <view class="slider-banner recommendSwiper" wx:if="{{info.bastBanner.length}}">
-                        <swiper autoplay="true" indicator-dots="true" circular="{{circular}}" interval="3000"
-                            duration="500" indicator-color="rgba(0,0,0,0.2)" indicator-active-color="#ff3366">
+                        <swiper autoplay="true" indicator-dots="true" circular="{{circular}}" interval="3000" duration="500" indicator-color="rgba(0,0,0,0.2)" indicator-active-color="#ff3366">
                             <swiper-item wx:for="{{info.bastBanner}}" wx:key='index'>
-                                <navigator url="{{item.url ? item.url : ''}}" class="pictrue acea-row row-middle"
-                                    hover-class="none">
+                                <navigator url="{{item.url ? item.url : ''}}" class="pictrue acea-row row-middle" hover-class="none">
                                     <image src="{{item.img}}"></image>
                                 </navigator>
                             </swiper-item>
@@ -308,16 +284,12 @@
 
                     <!-- 精品推荐 产品列表 -->
                     <view class="publicList acea-row row-between-wrapper">
-                        <view bindtap="goDetailType" data-items='{{item}}' class="item" wx:for="{{info.bastList}}"
-                            wx:key='index'>
+                        <view bindtap="goDetailType" data-items='{{item}}' class="item" wx:for="{{info.bastList}}" wx:key='index'>
                             <view class="pictrue">
                                 <image src="{{item.image}}"></image>
-                                <text class="pictrue_log_medium pictrue_log_class"
-                                    wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
-                                <text class="pictrue_log_medium pictrue_log_class"
-                                    wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
-                                <text class="pictrue_log_medium pictrue_log_class"
-                                    wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
+                                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
+                                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
+                                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
                             </view>
                             <view class="text">
                                 <view class="name line1">{{ item.store_name }}</view>
@@ -345,8 +317,7 @@
                         </navigator>
                     </view>
                     <view class="list acea-row">
-                        <navigator url="/pages/goods_details/index?id={{item.id}}" class="item" wx:for="{{likeInfo}}"
-                            wx:key='index'>
+                        <navigator url="/pages/goods_details/index?id={{item.id}}" class="item" wx:for="{{likeInfo}}" wx:key='index'>
                             <view class="pictrue">
                                 <image src="{{item.image}}"></image>
                                 <image src="/images/one01.png" class="icon" wx:if='{{index === 0}}'></image>
@@ -371,24 +342,19 @@
                         <navigator url="/pages/promotional-items/index" class="more" hover-class="none">更多 ></navigator>
                     </view>
                     <view class="publicList acea-row row-between-wrapper">
-                        <view bindtap="goDetailType" data-items='{{item}}' class="item" wx:for="{{benefit}}"
-                            wx:key='index'>
+                        <view bindtap="goDetailType" data-items='{{item}}' class="item" wx:for="{{benefit}}" wx:key='index'>
                             <view class="pictrue">
                                 <image src="{{item.image}}"></image>
-                                <text class="pictrue_log_medium pictrue_log_class"
-                                    wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
-                                <text class="pictrue_log_medium pictrue_log_class"
-                                    wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
-                                <text class="pictrue_log_medium pictrue_log_class"
-                                    wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
+                                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
+                                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
+                                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
                             </view>
                             <view class="text">
                                 <view class="name line1">{{ item.store_name }}</view>
                                 <view class="acea-row row-between-wrapper">
                                     <view>
                                         <view class="money font-color">
-                                            ¥<text class="num">{{ item.price }}</text><text
-                                                class="label bg-color">疯抢</text>
+                                            ¥<text class="num">{{ item.price }}</text><text class="label bg-color">疯抢</text>
                                         </view>
                                         <view class="ot-money">¥{{ item.ot_price }}</view>
                                     </view>
@@ -407,16 +373,12 @@
                         <image src="/images/becommendTitle.png"></image>
                     </view>
                     <view class="publicList acea-row row-between-wrapper">
-                        <view bindtap="goDetailType" data-items='{{item}}' wx:for="{{hotProducts}}" wx:key='index'
-                            class="item">
+                        <view bindtap="goDetailType" data-items='{{item}}' wx:for="{{hotProducts}}" wx:key='index' class="item">
                             <view class="pictrue">
                                 <image src="{{item.image}}"></image>
-                                <text class="pictrue_log_medium pictrue_log_class"
-                                    wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
-                                <text class="pictrue_log_medium pictrue_log_class"
-                                    wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
-                                <text class="pictrue_log_medium pictrue_log_class"
-                                    wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
+                                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type ==='1'}}">秒杀</text>
+                                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '2'}}">砍价</text>
+                                <text class="pictrue_log_medium pictrue_log_class" wx:if="{{item.activity && item.activity.type === '3'}}">拼团</text>
                             </view>
                             <view class="text">
                                 <view class="name line1">{{ item.store_name }}</view>
@@ -452,16 +414,12 @@
                 <!-- 活动商品列表 -->
                 <view class="classifyList acea-row row-between-wrapper">
                     <view style="height: {{item.aboveShowRowIndex * rowHeight}}rpx;"></view>
-                    <view bindtap="goDetailType" data-items='{{productItem}}' class="item" wx:for="{{item.products}}"
-                        wx:for-item="productItem" wx:key='index' wx:if="{{productItem.isShow}}">
+                    <view bindtap="goDetailType" data-items='{{productItem}}' class="item" wx:for="{{item.products}}" wx:for-item="productItem" wx:key='index' wx:if="{{productItem.isShow}}">
                         <view class="pictrue">
                             <image src="{{productItem.image}}"></image>
-                            <text class="pictrue_log_medium pictrue_log_class"
-                                wx:if="{{productItem.activity && productItem.activity.type ==='1'}}">秒杀</text>
-                            <text class="pictrue_log_medium pictrue_log_class"
-                                wx:if="{{productItem.activity && productItem.activity.type === '2'}}">砍价</text>
-                            <text class="pictrue_log_medium pictrue_log_class"
-                                wx:if="{{productItem.activity && productItem.activity.type === '3'}}">拼团</text>
+                            <text class="pictrue_log_medium pictrue_log_class" wx:if="{{productItem.activity && productItem.activity.type ==='1'}}">秒杀</text>
+                            <text class="pictrue_log_medium pictrue_log_class" wx:if="{{productItem.activity && productItem.activity.type === '2'}}">砍价</text>
+                            <text class="pictrue_log_medium pictrue_log_class" wx:if="{{productItem.activity && productItem.activity.type === '3'}}">拼团</text>
                         </view>
                         <view class="text">
                             <view class="name line1">{{ productItem.store_name }}</view>
@@ -496,5 +454,4 @@
 </view>
 
 <!-- coupon-window window='{{window}}' couponList="{{couponList}}" bind:onClose="onClose"></coupon-window -->
-<authorize wx:if="{{ !isShowMine }}" bind:onLoadFun='onLoadFun' isGoIndex='{{isGoIndex}}' iShidden="{{iShidden}}"
-    isAuto="{{isAuto}}"></authorize>
+<authorize wx:if="{{ !isShowMine }}" bind:onLoadFun='onLoadFun' isGoIndex='{{isGoIndex}}' iShidden="{{iShidden}}" isAuto="{{isAuto}}"></authorize>

+ 12 - 8
view/xcx/pages/user_spread_money/index.js

@@ -83,14 +83,18 @@ Page({
      * 获取余额使用记录
      */
     getRecordList: function () {
-        var that = this;
-        var page = that.data.page;
-        var limit = that.data.limit;
-        var status = that.data.status;
-        var recordType = that.data.recordType;
-        var recordList = that.data.recordList;
+        var page = this.data.page;
+        var limit = this.data.limit;
+        var status = this.data.status;
+        var recordType = this.data.recordType;
+        var recordList = this.data.recordList;
         var recordListNew = [];
-        if (status == true) return;
+
+        if (status == true) {
+            return;
+        }
+
+        var that = this;
         spreadCommission(recordType, {
             page: page,
             limit: limit
@@ -114,7 +118,7 @@ Page({
             });
         });
     },
-    
+
     /**
      * 生命周期函数--监听页面隐藏
      */

+ 1 - 0
view/xcx/utils/wxh.js

@@ -157,6 +157,7 @@ var tapsize = function (that, e) {
     })
 }
 
+// 取得授权地址
 var selfLocation = function (showMode) {
     const that = this;
     return new Promise((resolve, reject) => {