优化文件和新增部分界面

src/app.json

@@ -66,7 +66,10 @@
         "pages/chooseStore/chooseStore",
         "pages/selfPickUpOrderList/selfPickUpOrderList",
         "pages/selfPickUpOrderInfo/selfPickUpOrderInfo",
-        "pages/shareConfig/shareConfig"
+        "pages/shareConfig/shareConfig",
+        "pages/liveVideo/liveVideo",
+        "pages/couponCenter/couponCenter",
+        "pages/couponCenterInfo/couponCenterInfo"
       ]
     },
     {

src/config/index.js

@@ -6,7 +6,7 @@
 // 修改 BRANCH_ID 为对应的商户id
 // app.js 中brandId 修改为对应
 
-const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
+const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
 //仅生产环境时 配置 ： 
 //3001 3001 ,  wx313ec36b710125d4
 //2006 泰华 , wx40fec8944623c8b3
@@ -21,7 +21,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2015 花在花园
 //2016 阿吉豆
 //2017 ACTREE wx2aae34874e88cdf5
-const BRANCH_ID = 3001
+const BRANCH_ID = 1002
 const isMall = true
 
 // const needMock = '' //

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wx313ec36b710125d4",
+	"appid": "wxac09792264c49b5c",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []
@@ -544,6 +544,27 @@
 					"pathName": "subPackage/page/pages/shareConfig/shareConfig",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "直播空白页",
+					"pathName": "subPackage/page/pages/liveVideo/liveVideo",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": 76,
+					"name": "优惠券领取中心",
+					"pathName": "subPackage/page/pages/couponCenter/couponCenter",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": 77,
+					"name": "领取中心优惠券详情",
+					"pathName": "subPackage/page/pages/couponCenterInfo/couponCenterInfo",
+					"query": "",
+					"scene": null
 				}
 			]
 		}

src/subPackage/page/pages/couponCenter/couponCenter.js

+// pages/userCenter.js
+const wxService = require('../../../../utils/wxService')
+
+wxService.page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    query: '',
+    integralCouponList: [], // 积分兑换优惠券列表
+    noMore: false,
+    isExchange: false,
+    exchangeId: '',
+    exchangePoint: 0,
+    dialogStockEmpty: false,
+    dialogUserLimit: false,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    wx.hideShareMenu();
+    this.initIntegralCouponList();
+  },
+ 
+  
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    
+  },
+  
+  
+  // 积分兑换优惠券列表
+  initIntegralCouponList() {
+    wx.showLoading({
+      title: '加载中'
+    });
+
+    wxService.get(`/coupon/pointsRedemptionCouponSetting/getAllValid`).then(res => {
+      if (res) {
+        const { result, data } = res.data
+        if (result == 0) {
+          wx.hideLoading()
+          this.setData({
+            integralCouponList: data.reverse()
+          });
+        }
+      }
+    }).finally(() => {
+      wx.hideLoading();
+    })
+  },
+  //立即兑换优惠券
+  exchange(e) {
+    const { id, point } = e.currentTarget.dataset
+    wx.showToast({
+      title: '领取成功！',
+    });
+  },
+  //跳转到详情
+  goCouponDetail(e) {
+    const { id } = e.currentTarget.dataset
+    wxService.router(`/subPackage/page/pages/couponCenterInfo/couponCenterInfo?id=${id}`)
+  },
+  /**
+  * 页面相关事件处理函数--监听用户下拉动作
+  */
+  onPullDownRefresh: function () { },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+})
\ No newline at end of file

src/subPackage/page/pages/couponCenter/couponCenter.json

+{
+  "navigationBarTitleText": "领券中心",
+  "usingComponents": {
+    "no-more": "/component/noMore/noMore",
+    "exchange-coupon-modal": "/component/exchange-coupon-modal/exchange-coupon-modal",
+    "dialog-stock-empty": "/component/dialogStockEmpty/dialogStockEmpty",
+    "dialog-user-limit": "/component/dialogUserLimit/dialogUserLimit",
+    "go-home": "/component/goHome/goHome",
+    "go-guid": "/component/goGuid/goGuid"
+  }
+}
\ No newline at end of file

src/subPackage/page/pages/couponCenter/couponCenter.wxml

+<!--pages/userCenter.wxml-->
+<view class='page-integral-mall'>
+	<!-- 优惠券列表-->
+	<view>
+		<view class='coupon-wrap' wx:if="{{integralCouponList.length}}">
+			<view
+			 class='coupon-list'
+			 wx:for="{{integralCouponList}}"
+			 wx:for-item="item"
+			 wx:for-index="k"
+			 wx:key="{{k}}"
+			 data-id="{{item.id}}"
+			>
+				<view class="coupon-item">
+					<view class='coupon-img-title' data-id="{{item.id}}" bindtap="goCouponDetail">
+						<view class='coupon-img'>
+							<image wx:if="{{item.thumbnail}}" src='{{item.thumbnail}}' mode="aspectFit"/>
+							<image wx:else src='/assets/imgs/qr-code.png' />
+						</view>
+						<view class='coupon-info'>
+							<view class='coupon-name fs-28'>{{item.title}}</view>
+							<view class='coupon-desc text-align-left fs-24'>查看详情</view>
+						</view>
+					</view>
+					<view class='coupon-btn positionRe'>
+            <button wx:if="{{!currentHasUserInfo}}" 
+            bindgetuserinfo="_getUserInfo" 
+            open-type='getUserInfo' 
+            class="clear-btn positionAbs"></button>
+						<view class='coupon-btn-click theme-color' 
+							data-id="{{item.id}}"
+							data-point="{{item.point}}"
+							bindtap='exchange'>立即领取</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class='empty-wrap' wx:if="{{!integralCouponList.length}}">
+			<view class='empty-info'>
+				<image class='empty-img' src='/assets/imgs/empty-coupon.png' />
+				<view class='empty-text'>没有任何卡劵活动</view>
+			</view>
+		</view>
+	</view>
+</view>
+<!-- 库存没了 -->
+<dialog-stock-empty show="{{dialogStockEmpty}}"/>
+<dialog-user-limit show="{{dialogUserLimit}}"/>
+<go-guid />
+<go-home/>
+
+
+
+

src/subPackage/page/pages/couponCenter/couponCenter.wxss

+/* subPackage/page/pages/couponCenter/couponCenter.wxss */
+/* pages/userCenter.wxss */
+@import "/base/base.wxss";
+
+page {
+  /* background-color: rgba(0, 0, 0, 0.05); */
+  background: #ffffff;
+}
+.page-integral-mall {
+  border-top: 1px solid rgba(151, 151, 151, 0.1);
+}
+.empty-wrap {
+  width: 300rpx;
+  margin: 190rpx auto 0;
+  text-align: center;
+}
+.empty-img {
+  width: 197rpx;
+  height: 176rpx;
+  margin-bottom: 48rpx;
+}
+.empty-text {
+  color: #cccccc;
+  font-size: 28rpx;
+}
+
+/* 卡劵列表 */
+.coupon-wrap {
+  padding: 20rpx;
+  clear: both;
+}
+.coupon-list {
+  margin-bottom: 10rpx;
+  border-bottom: solid 1px #eeeeee;
+}
+.coupon-img-title {
+  display: flex;
+  align-items: center;
+}
+.coupon-item {
+  display: flex;
+  align-items: center;
+  height: 144rpx;
+  background-color: #fff;
+  justify-content: space-between;
+}
+.coupon-btn {
+  margin-right: 30rpx;
+}
+.coupon-btn-click {
+  width: 153.8rpx;
+  height: 48rpx;
+  border-radius: 33rpx;
+  line-height: 48rpx;
+  color: rgba(255, 255, 255, 1);
+  font-size: 24rpx;
+  text-align: center;
+}
+
+.coupon-btn-click.disabled{
+  background-color: #dddddd !important;
+  box-shadow: none;
+}
+
+.coupon-btn-num {
+  width: 153.8rpx;
+  height: 22rpx;
+  color: rgba(250, 100, 0, 1);
+  font-size: 22rpx;
+  text-align: center;
+  margin-top: 10rpx;
+}
+.coupon-img {
+  box-sizing: border-box;
+  margin-left: 30rpx;
+}
+.coupon-img image {
+  width: 80rpx;
+  height: 80rpx;
+}
+.coupon-info {
+  padding: 42rpx 39rpx;
+  box-sizing: border-box;
+}
+.coupon-name {
+  color: #333;
+}
+.coupon-time {
+  color: #fc921e;
+  margin-bottom: 18rpx;
+  font-size: 26rpx;
+}
+.coupon-desc {
+  /* color: #999;
+  margin-top: 11rpx;
+  width: 360rpx;
+  font-size: 24rpx; */
+
+  color: rgba(118, 161, 213, 1);
+  font-size: 22rpx;
+  text-align: right;
+  margin-top: 18rpx;
+
+}
+
+.text-align-left{
+  text-align: left !important;
+}
+
+.coupon-code {
+  color: #ffffff;
+  word-wrap: break-word;
+  font-weight: bold;
+  margin: 0 10rpx;
+  padding: 35rpx 20rpx;
+  box-sizing: content-box;
+  width: 40rpx;
+  line-height: 35rpx;
+}
+.invalid-coupon {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 3;
+  border-radius: 7rpx;
+}
+.invalid-img {
+  position: absolute;
+  width: 147rpx;
+  height: 147rpx;
+  right: 81rpx;
+  top: 31rpx;
+  z-index: 4;
+}
+.point-img {
+  width: 28rpx;
+  height: 36rpx;
+}
+
+.title-img-point {
+  display: flex;
+  align-items: center;
+}
+
+.point-exchange-goods-records{
+  font-size: 28rpx;
+  color: #ffffff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 80rpx;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.65);
+  z-index: 2;
+  width: 100%;
+}
+
+.point-exchange-goods-records:active{
+  opacity: 0.7;
+}
+
+.text-point {
+  color: rgba(51, 51, 51, 1);
+  font-size: 42rpx;
+  margin-left: 10rpx;
+}
+.mall-title {
+  height: 150rpx;
+  padding-left: 50rpx;
+  padding-right: 42rpx;
+  box-sizing: border-box;
+  background-color: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 8px 5px rgba(0, 0, 0, 0.05),
+    0px 0px 3px 0px rgba(0, 0, 0, 0.03);
+}
+.title-num-point {
+  padding-top: 30rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.integral-vip-rules {
+  width: 133rpx;
+  height: 42rpx;
+  line-height: 42rpx;
+  border-radius: 34rpx;
+  font-size: 23rpx;
+  text-align: center;
+  border: 1px solid rgba(204, 204, 204, 1);
+}
+.title-time-point {
+  color: rgba(102, 102, 102, 1);
+  font-size: 20rpx;
+  text-align: left;
+  padding-top: 3rpx;
+  margin-top: 15rpx;
+}
+
+.mall-tab {
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  background-color: #fff;
+  padding: 5rpx 0;
+  box-sizing: border-box;
+  margin-top: 10rpx;
+  border-bottom: solid 1px #eeeeee;
+}
+.tab-coupon, .tab-goods,.tab-coupon-goods {
+  flex: 1;
+  text-align: center;
+  color: rgba(102, 102, 102, 1);
+  font-size: 26rpx;
+}
+.tab-coupon {
+  border-right: 1rpx solid rgba(102, 102, 102, 1);
+}
+.tab-active {
+  color: rgba(5, 195, 91, 1);
+}
\ No newline at end of file

src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.js

+// subPackage/page/pages/couponCenterInfo/couponCenterInfo.js
+const wxService = require('../../../../utils/wxService')
+wxService.page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.json

+{
+  "navigationBarTitleText": "优惠券信息",
+  "usingComponents": {}
+}
\ No newline at end of file

src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.wxml

+<!--subPackage/page/pages/couponCenterInfo/couponCenterInfo.wxml-->
+<view class="coupon-info-con">
+  <view class="coupon-info-bg" style="background-image:url('https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/coupon-bg.png')">
+    <view class="lf-coupon-Bg">
+      <image mode="aspectFit" src="https://img3.bigaka.com/test/1002/202003/20200302/100268e4d2cc-f33a-42a3-8ff8-2d4ff5d9c958.png"></image>
+    </view>
+    <view class="rg-coupon-info">
+      <view class="coupon-title">阿吉豆测试-满折</view>
+      <view class="coupon-date">有效期：2020-03-02 至 2020-04-01</view>
+      <view class="coupon-price theme-text-color">抵用券 50元</view>
+    </view>
+  </view>
+  <!-- 活动说明 -->
+  <view class='integral-detail'>
+    <view class='integral-list'>
+      <text class='integral-title'>活动标题</text>
+      <text class='integral-desc wpl'>这个是活动的说明信息</text>
+    </view>
+    <view class='integral-list'>
+      <text class='integral-title'>活动时间</text>
+      <text class='integral-desc wpl'>这个活动时间活动时间活动时间</text>
+    </view>
+  </view>
+
+  <!-- 按钮 -->
+  
+  <view class="get-btn positionRe">
+    <button wx:if="{{!currentHasUserInfo}}" 
+    bindgetuserinfo="_getUserInfo" 
+    open-type='getUserInfo' 
+    class="clear-btn positionAbs">立即领取</button>
+    <view wx:else class="view-btn">立即领取</view>
+  </view>
+</view>
+

src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.wxss

+/* subPackage/page/pages/couponCenterInfo/couponCenterInfo.wxss */
+page{
+  background: #ffffff;
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+
+view{
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+
+.coupon-info-con{
+  padding: 30rpx;
+}
+
+.coupon-info-bg{
+  width: 100%;
+  height: 174rpx;
+  background-position: center;
+  background-size: 100%;
+  background-repeat: no-repeat;
+  position: relative;
+  padding-left: 170rpx;
+}
+
+.coupon-info-bg .lf-coupon-Bg{
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 170rpx;
+  height: 100%;
+  padding: 15rpx;
+}
+
+.coupon-info-bg .lf-coupon-Bg image{
+  width: 100%;
+  height: 100%;
+}
+
+.coupon-info-bg .rg-coupon-info{
+  width: 100%;
+  height: 100%;
+  padding: 15rpx;
+  font-size: 24rpx;
+}
+
+.coupon-title{
+  font-size: 28rpx;
+  color: #333333;
+  margin-bottom: 8rpx;
+  font-weight: 550;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+}
+
+.coupon-date{
+  font-size: 24rpx;
+  color: #999999;
+  margin-bottom: 5rpx;
+}
+
+.integral-detail{
+  margin-top: 60rpx;
+}
+.integral-list{
+  margin-bottom: 20rpx;
+  font-size: 28rpx;
+
+}
+
+.integral-title{
+  color: #333333;
+  margin-right: 8rpx;
+}
+
+.integral-desc{
+  color: #999999;
+}
+
+.integral-title,.integral-desc{
+  display: inline-block;
+}
+
+.get-btn{
+  width: 100%;
+  height: 90rpx;
+  margin-top: 80rpx;
+  background: -webkit-linear-gradient(left,rgb(203,60,60,0.7),rgb(203,60,60,1));
+  border-radius: 8rpx;
+  color: #ffffff;
+  font-size: 28rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.get-btn button{
+  color: #ffffff;
+  font-size: 28rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.get-btn .view-btn{
+  color: #ffffff;
+  font-size: 28rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  z-index: 1;
+}
+
+.get-btn:active{
+  opacity: 0.7;
+}
\ No newline at end of file

src/subPackage/page/pages/liveVideo/liveVideo.js

+// subPackage/page/pages/liveVideo/liveVideo.js
+const app = getApp()
+const wxService = require('../../../../utils/wxService')
+const utils = require('../../../../utils/util')
+const envInfo = require('../../../../config/index').envInfo
+wxService.page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

src/subPackage/page/pages/liveVideo/liveVideo.json

+{
+  "navigationBarTitleText": "直播跳转中..",
+  "usingComponents": {}
+}
\ No newline at end of file

src/subPackage/page/pages/liveVideo/liveVideo.wxml

+<!--subPackage/page/pages/liveVideo/liveVideo.wxml-->
+<text>subPackage/page/pages/liveVideo/liveVideo.wxml</text>

src/subPackage/page/pages/liveVideo/liveVideo.wxss

+/* subPackage/page/pages/liveVideo/liveVideo.wxss */
\ No newline at end of file