From 5182d76aa05649ec678157f0951cf580bff7a79c Mon Sep 17 00:00:00 2001
From: gooking <javazj@qq.com>
Date: Sat, 9 Jan 2021 21:47:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E6=88=90=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                             |   1 +
 config.js                            |   4 +-
 images/notice.png                    | Bin 4874 -> 0 bytes
 miniprogram_npm/apifm-wxapi/index.js |   4 +-
 pages/coupons/merge.js               |  99 +++++++++++++++++++++++++++
 pages/coupons/merge.json             |   4 ++
 pages/coupons/merge.wxml             |  15 ++++
 pages/coupons/merge.wxss             |   1 +
 pages/index/index.js                 |   6 ++
 pages/index/index.json               |   5 +-
 pages/index/index.wxml               |  31 ++++-----
 pages/index/index.wxss               |  58 ++--------------
 pages/my/index.wxml                  |   3 +-
 pages/search/index.json              |   2 +-
 project.config.json                  |   2 +-
 15 files changed, 159 insertions(+), 76 deletions(-)
 delete mode 100644 images/notice.png
 create mode 100644 pages/coupons/merge.js
 create mode 100644 pages/coupons/merge.json
 create mode 100644 pages/coupons/merge.wxml
 create mode 100644 pages/coupons/merge.wxss

diff --git a/app.json b/app.json
index 1a8d3f51..7d96b837 100644
--- a/app.json
+++ b/app.json
@@ -32,6 +32,7 @@
     "pages/fx/members",
     "pages/fx/commisionLog",
     "pages/coupons/index",
+    "pages/coupons/merge",
     "pages/invoice/list",
     "pages/invoice/apply",
     "pages/deposit/pay",
diff --git a/config.js b/config.js
index 5d4ec533..2058adcc 100644
--- a/config.js
+++ b/config.js
@@ -1,6 +1,6 @@
 module.exports = {
-  version: '9.14.1',
-  note: '增加商品浏览足迹', // 这个为版本描述，无需修改
+  version: '9.15.0',
+  note: '增加合成优惠券功能', // 这个为版本描述，无需修改
   subDomain: 'tz', // 此处改成你自己的专属域名。什么是专属域名？请看教程 https://www.it120.cc/help/qr6l4m.html
   sdkAppID: 1400450467, // 腾讯实时音视频应用编号，请看教程 https://www.it120.cc/help/nxoqsl.html
 }
\ No newline at end of file
diff --git a/images/notice.png b/images/notice.png
deleted file mode 100644
index 2cd80c92e6e58fb0d67b61d042618847849519ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4874
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

diff --git a/miniprogram_npm/apifm-wxapi/index.js b/miniprogram_npm/apifm-wxapi/index.js
index 9bde205d..45ca77c0 100644
--- a/miniprogram_npm/apifm-wxapi/index.js
+++ b/miniprogram_npm/apifm-wxapi/index.js
@@ -94,8 +94,8 @@ module.exports =
 
 /* eslint-disable */
 // 小程序开发api接口工具包，https://github.com/gooking/wxapi
-var API_BASE_URL = 'https://api.it120.cc';
-// var API_BASE_URL = 'http://127.0.0.1:8081';
+// var API_BASE_URL = 'https://api.it120.cc';
+var API_BASE_URL = 'http://127.0.0.1:8081';
 var subDomain = '-';
 
 var request = function request(url, needSubDomain, method, data) {
diff --git a/pages/coupons/merge.js b/pages/coupons/merge.js
new file mode 100644
index 00000000..efd8252a
--- /dev/null
+++ b/pages/coupons/merge.js
@@ -0,0 +1,99 @@
+const WXAPI = require('apifm-wxapi')
+const AUTH = require('../../utils/auth')
+Page({
+  data: {
+
+  },
+  onLoad: function (options) {
+    this.mergeCouponsRules();
+  },
+  onShow: function () {
+
+  },
+  async mergeCouponsRules() {
+    const res = await WXAPI.mergeCouponsRules()
+    if (res.code == 0) {
+      this.setData({
+        mergeCouponsRules: res.data
+      })
+    }
+  },
+  onPullDownRefresh() {
+    this.mergeCouponsRules()
+    wx.stopPullDownRefresh()
+  },
+  async merge(e) {
+    const idx = e.currentTarget.dataset.idx
+    const mergeCouponsRule = this.data.mergeCouponsRules[idx]
+    this.setData({loading: true})
+    let res = await WXAPI.myCoupons({
+      token: wx.getStorageSync('token'),
+      status: 0
+    })
+    if (res.code == 700) {
+      wx.showToast({
+        title: '您暂无可用的优惠券',
+        icon: 'none'
+      })
+      this.setData({loading: false})
+      return
+    }
+    if (res.code != 0) {
+      wx.showToast({
+        title: res.msg,
+        icon: 'none'
+      })
+      this.setData({loading: false})
+      return
+    }
+    const myCoupons = res.data.reverse()
+    const couponIds = [] // 用来合成的优惠券id
+    let ok = true
+    let msg = ''
+    mergeCouponsRule.rules.filter(rule => {
+      return rule.type == 0
+    }).forEach(rule => {
+      for (let i = 0; i < rule.number; i++) {
+        const couponIndex = myCoupons.findIndex(ele => { return ele.pid == rule.couponId})
+        if (couponIndex == -1) {
+          ok = false
+          msg = rule.couponName
+          return
+        }
+        const coupon = myCoupons[couponIndex]
+        couponIds.push(coupon.id)
+        myCoupons.splice(couponIndex, 1)
+      }
+    })
+    if (!ok) {
+      wx.showToast({
+        title: '缺少优惠券:' + msg,
+        icon: 'none'
+      })
+      this.setData({loading: false})
+      return
+    }
+    res = await WXAPI.mergeCoupons({
+      token: wx.getStorageSync('token'),
+      mergeId: mergeCouponsRule.id,
+      couponIds: couponIds.join()
+    })
+    if (res.code != 0) {
+      wx.showToast({
+        title: res.msg,
+        icon: 'none'
+      })
+      this.setData({loading: false})
+      return
+    }
+    wx.showToast({
+      title: '兑换成功'
+    })
+    this.setData({loading: false})
+    setTimeout(() => {
+      wx.navigateBack({
+        delta: 0,
+      })
+    }, 1000);
+  }
+})
\ No newline at end of file
diff --git a/pages/coupons/merge.json b/pages/coupons/merge.json
new file mode 100644
index 00000000..df602533
--- /dev/null
+++ b/pages/coupons/merge.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "优惠券合成",
+  "enablePullDownRefresh": true
+}
\ No newline at end of file
diff --git a/pages/coupons/merge.wxml b/pages/coupons/merge.wxml
new file mode 100644
index 00000000..ceeececb
--- /dev/null
+++ b/pages/coupons/merge.wxml
@@ -0,0 +1,15 @@
+<van-empty wx:if="{{ !mergeCouponsRules }}" description="暂无合成规则" />
+<van-cell-group wx:for="{{mergeCouponsRules}}" wx:key="id" title="{{ item.name }}">
+  <van-cell
+    wx:for="{{item.rules}}"
+    wx:for-item="rule"
+    wx:key="id"
+    icon="{{ rule.type == 0 ? 'delete' : 'share-o' }}"
+    title="{{ rule.typeStr }}"
+    label="优惠券:{{ rule.couponName }}"
+    value="{{rule.number}} 张"
+  />
+  <view class="block-btn">
+    <van-button type="primary" block data-idx="{{ index }}" loading="{{ loading }}" bind:click="merge">立即合成</van-button>
+  </view>
+</van-cell-group>
\ No newline at end of file
diff --git a/pages/coupons/merge.wxss b/pages/coupons/merge.wxss
new file mode 100644
index 00000000..32d983ef
--- /dev/null
+++ b/pages/coupons/merge.wxss
@@ -0,0 +1 @@
+/* pages/coupons/merge.wxss */
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 01e68464..00ffacf5 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -306,5 +306,11 @@ Page({
     wx.navigateTo({
       url: '/pages/search/index'
     })
+  },
+  goNotice(e) {
+    const id = e.currentTarget.dataset.id
+    wx.navigateTo({
+      url: '/pages/notice/show?id=' + id,
+    })
   }
 })
\ No newline at end of file
diff --git a/pages/index/index.json b/pages/index/index.json
index 5458fbe6..1310df0f 100644
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -1,3 +1,6 @@
 {
-  "enablePullDownRefresh": true
+  "enablePullDownRefresh": true,
+  "navigationBarBackgroundColor": "#e64340",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#e64340"
 }
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 6de6901c..e1c70714 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -10,16 +10,13 @@
     </view>
   </view>
 </navigator>
+<van-search value="{{ value }}" placeholder="请输入搜索关键词" readonly background="#e64340" shape="round" bindtap="goSearch" />
 <view class="swiper-container">
   <swiper class="swiper1" indicator-dots="true" indicator-active-color="#fff" autoplay circular>
     <swiper-item wx:for="{{banners}}" wx:key="id">
-      <image  mode="aspectFill" bindtap="tapBanner" data-url="{{item.linkUrl}}" src="{{item.picUrl}}" />
+      <image mode="aspectFill" bindtap="tapBanner" data-url="{{item.linkUrl}}" src="{{item.picUrl}}" />
     </swiper-item>
   </swiper>
-  <view class="search" bindtap="goSearch">
-    <input type="text" placeholder="输入搜索关键词" disabled></input>
-    <image src="/images/icon/search.svg"></image>
-  </view>
   <view wx:if="{{goodsDynamic}}" class="goodsDynamic">
     <swiper class="swiper2" autoplay circular vertical>
       <navigator wx:for="{{goodsDynamic}}" wx:key="index" url="/pages/goods-details/index?id={{item.goodsId}}">
@@ -34,17 +31,19 @@
   </view>
 </view>
 <view class="notice-box" wx:if="{{noticeList}}">
-  <view class="notice">
-    <image class="notice_icon" src="/images/notice.png"></image>
-    <swiper class="notice_swiper" vertical autoplay circular>
-      <navigator wx:for="{{noticeList.dataList}}" wx:key="id" url="/pages/notice/show?id={{item.id}}">
-        <swiper-item>
-          <view class="notice_itemr">{{item.title}}</view>
-        </swiper-item>
-      </navigator>
-    </swiper>
-  </view>
-  <view class="more"><navigator url="/pages/notice/index">更多 ></navigator></view>
+  <swiper class="notice_swiper" vertical autoplay circular interval="8000">
+    <swiper-item wx:for="{{noticeList.dataList}}" wx:key="id">
+      <van-notice-bar
+        wx:if="{{noticeList}}"
+        left-icon="volume-o"
+        mode="link"
+        text="{{ item.title }}"
+        background="#FFFFFF"
+        data-id="{{ item.id }}"
+        bind:click="goNotice"
+      />
+    </swiper-item>
+  </swiper>
 </view>
 <view class="category-box">
   <view class="category-list" wx:for="{{categories}}" wx:key="id">
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index fd45e92d..3ac59812 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -27,40 +27,12 @@
   width: 40rpx;
   height: 40rpx;
 }
-
-.search {
-  position: absolute;
-  top: 32rpx;
-  left: 25rpx;
-  width: 700rpx;
-  height: 66rpx;
-  display: block;
-  box-sizing: border-box;
-}
-.search input {
-  display: block;
-  box-sizing: border-box;
-  background: rgba(255, 255, 255, 0.8);
-  border: 1rpx solid #e3e3e3;
-  width: 700rpx;
-  height: 66rpx;
-  border-radius: 30rpx;
-  padding-left: 32rpx; 
-}
-.search image {
-  width: 35rpx;
-  height: 35rpx;
-  position: absolute;
-  top: 16rpx;
-  right: 32rpx;
-  z-index: 99;
-}
 .goodsDynamic {
   position: absolute;
-  top: 110rpx;
-  left: 25rpx;
+  bottom: 64rpx;
+  left: 16rpx;
   width: 650rpx;
-  background: rgba(0, 0, 0, 0.6);
+  background: rgba(0, 0, 0, 0.4);
   color: #fff;  
   padding: 8rpx 16rpx;
   border-radius: 32rpx;
@@ -88,30 +60,14 @@
   overflow: hidden;
 }
 .notice-box {
-  display: flex;
-  box-sizing: border-box;
   width: 100vw;
   height: 88rpx;
   line-height: 88rpx;
-  justify-content: space-between;
-  align-items: center;
-  padding-right: 32rpx;
   border-bottom: 1rpx solid #efeff4;
 }
-.notice{
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  width: 600rpx;
-}
-.notice_icon {
-  margin-left:20rpx;
-  width:30rpx;
-  height:30rpx;
-}
 .notice_swiper{
   height: 88rpx;
-  width: 600rpx;
+  width: 100%;
 }
 .notice_itemr {
   padding-left: 16rpx;
@@ -119,10 +75,6 @@
   overflow: hidden;
   color: #e64340;
 }
-.notice-box .more {
-  color: #666;
-  font-size: 24rpx;
-}
 
 .container {
   background-color: #fff;
@@ -169,6 +121,8 @@
 .swiper-container .swiper1 image {
   width: 750rpx;
   height: 375rpx;
+  /* margin: 8rpx 15rpx; */
+  /* border-radius: 16rpx; */
 }
 ::-webkit-scrollbar {
   width: 0;
diff --git a/pages/my/index.wxml b/pages/my/index.wxml
index b429356e..c58a4ac8 100755
--- a/pages/my/index.wxml
+++ b/pages/my/index.wxml
@@ -91,7 +91,8 @@
   <van-cell title="资金明细" is-link url="/pages/asset/index" />
   <van-cell title="申请发票" is-link url="/pages/invoice/apply" />
   <van-cell title="发票记录" is-link url="/pages/invoice/list" />
-  <van-cell title="领券中心" is-link url="/pages/coupons/index" />
+  <van-cell title="领取优惠券" is-link url="/pages/coupons/index" />
+  <van-cell title="合成优惠券" is-link url="/pages/coupons/merge" />
 </van-cell-group>
 <van-cell-group title="三级分销">
   <van-cell wx:if="{{!apiUserInfoMap.base.isSeller}}" title="成为分销商" is-link url="/pages/fx/apply-status" />
diff --git a/pages/search/index.json b/pages/search/index.json
index 386ec660..9ac68608 100644
--- a/pages/search/index.json
+++ b/pages/search/index.json
@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "搜索一下"
+  "navigationBarTitleText": "搜一搜"
 }
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 93f13aaa..bcdf3d44 100644
--- a/project.config.json
+++ b/project.config.json
@@ -35,7 +35,7 @@
     "minifyWXSS": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.14.1",
+  "libVersion": "2.14.3",
   "appid": "wxa46b09d413fbcaff",
   "projectname": "%E5%A4%A9%E4%BD%BF%E7%AB%A5%E8%A3%85",
   "scripts": {},