wxd / MShopWeApp

Commit 16daf39c4d600c4332b27436b17e0cf96a2fb39c

Authored by 后端研发-苏明海
2 parents 33ba59ee 59b9ee40

Merge branch 'test' into 'qa' 

Test

See merge request !1073
Inline Side-by-side
Showing 22 changed files with 772 additions and 48 deletions
... ... @@ -161,7 +161,7 @@ App({
161 161  
162 162 if (!th.err_going) {
163 163 wx.reLaunch({
164   - url: "/pages/error/error?msg=该商城已到期，暂停浏览1！\r\n可联系:" + res.data.data.store_tel,
  164 + url: "/packageD/pages/error/error?msg=该商城已到期，暂停浏览1！\r\n可联系:" + res.data.data.store_tel,
165 165 });
166 166 }
167 167 })
... ... @@ -170,7 +170,7 @@ App({
170 170  
171 171 if (!th.err_going) {
172 172 wx.reLaunch({
173   - url: "/pages/error/error?msg=还未购买小程序",
  173 + url: "/packageD/pages/error/error?msg=还未购买小程序",
174 174 });
175 175 }
176 176  
... ... @@ -190,7 +190,7 @@ App({
190 190 th.promiseGet('/api/weshop/store/get/' + t.stoid, {}).then(res => {
191 191 if (!th.err_going) {
192 192 wx.reLaunch({
193   - url: "/pages/error/error?msg=该商城已到期，暂停浏览1！\r\n可联系:" + res.data.data.store_tel,
  193 + url: "/packageD/pages/error/error?msg=该商城已到期，暂停浏览1！\r\n可联系:" + res.data.data.store_tel,
194 194 });
195 195 }
196 196 })
... ... @@ -198,7 +198,7 @@ App({
198 198 else if (tt && tt.isbuy == 0) {
199 199 if (!th.err_going) {
200 200 wx.reLaunch({
201   - url: "/pages/error/error?msg=还未购买小程序",
  201 + url: "/packageD/pages/error/error?msg=还未购买小程序",
202 202 });
203 203 }
204 204  
... ...
app.json
  View file @16daf39
... ... @@ -203,7 +203,8 @@
203 203 "pages/user/member/cash_record/cash_record",
204 204 "pages/gift/gift",
205 205  
206   - "pages/shop/order_detail/order_detail"
  206 + "pages/shop/order_detail/order_detail",
  207 + "pages/error/error"
207 208 ]
208 209 }
209 210  
... ...
packageA/pages/liveStreamDetails/liveStreamDetails.js
  View file @16daf39
... ... @@ -9,6 +9,7 @@ var t = require("../../../utils/util.js"),
9 9 oo = s.globalData,
10 10 o = s.globalData.setting,
11 11 os = o;
  12 +var regeneratorRuntime = require('../../../utils/runtime.js');
12 13  
13 14 const app = getApp();
14 15  
... ... @@ -148,15 +149,59 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
148 149 },
149 150  
150 151 // 生成海报
151   - drawPlaybill: function () {
  152 + drawPlaybill: async function () {
  153 +
  154 + var that=this;
152 155 // wx.showLoading({
153 156 // title: '正在生成海报...'
154 157 // });
  158 +
  159 +
  160 + if(!this.data.coverImg) {
  161 +
  162 + // 请求主图
  163 + await that.getImageInfo(that.data.details['share_img']).then(res => {
  164 + that.setData({
  165 + coverImg: res.path,
  166 + coverImgWidth: res.width,
  167 + coverImgHeight: res.height,
  168 + coverImgSize: that.imageResize(res.width, res.height),
  169 + // coverImgHeight: res.height,
  170 + });
  171 + // console.log('主图加载成功~', that.data.coverImgSize);
  172 + });
  173 + }
  174 +
  175 + if(!this.data.avatarUrl) {
  176 +
  177 + // 请求头像
  178 + await that.getImageInfo(app.globalData.userInfo['head_pic']).then(res => {
  179 + that.setData({
  180 + avatarUrl: res.path
  181 + });
  182 + console.log('头像加载成功~')
  183 + });
  184 + }
  185 +
  186 + // 请求二维码
  187 + var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
  188 + os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo";
  189 +
  190 + if(!this.data.ewm) {
  191 +
  192 + await that.getImageInfo(path3).then(res => {
  193 + that.setData({
  194 + ewm: res.path
  195 + });
  196 + console.log('二维码加载成功~')
  197 + });
  198 + }
  199 +
  200 +
155 201  
156 202 // 数据准备
157 203 const title = this.data.details.name;
158 204 // const headImg = app.globalData.userInfo['head_pic'];
159   - const that = this;
160 205  
161 206 // console.log('----------------v', headImg);
162 207  
... ... @@ -479,37 +524,6 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
479 524 }
480 525  
481 526  
482   -
483   - // 请求主图
484   - that.getImageInfo(that.data.details['share_img']).then(res => {
485   - that.setData({
486   - coverImg: res.path,
487   - coverImgWidth: res.width,
488   - coverImgHeight: res.height,
489   - coverImgSize: that.imageResize(res.width, res.height),
490   - // coverImgHeight: res.height,
491   - });
492   - // console.log('主图加载成功~', that.data.coverImgSize);
493   - });
494   -
495   - // 请求头像
496   - that.getImageInfo(app.globalData.userInfo['head_pic']).then(res => {
497   - that.setData({
498   - avatarUrl: res.path
499   - });
500   - console.log('头像加载成功~')
501   - });
502   -
503   - // 请求二维码
504   - var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
505   - os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo";
506   - that.getImageInfo(path3).then(res => {
507   - that.setData({
508   - ewm: res.path
509   - });
510   - console.log('二维码加载成功~')
511   - });
512   -
513 527 }
514 528 })
515 529  
... ...
packageA/pages/profile/profile.js
  View file @16daf39
... ... @@ -631,7 +631,7 @@ Page({
631 631 stoid:r.stoid,
632 632 mobile:getApp().globalData.zc_dd.mobile
633 633 };
634   - if(getApp().globalData.zc_dd.first_leade)
  634 + if(getApp().globalData.zc_dd.first_leader)
635 635 req_data.first_leader=getApp().globalData.zc_dd.first_leader
636 636  
637 637 wx.showLoading();
... ... @@ -669,6 +669,13 @@ Page({
669 669 }
670 670 set_data.user=back_data.erpviplist;
671 671 }
  672 +
  673 + //-- 新的会员 --
  674 + if(back_data && back_data.data.pickup_id && !set_data.sto_sele_id){
  675 + set_data.stoname=back_data.data.pickup_name;
  676 + set_data.sto_sele_id=back_data.data.pickup_id;
  677 + }
  678 +
672 679 self.setData(set_data);
673 680 if(!self.data.sto_sele_id){
674 681 self.get_store_set();
... ...
packageA/pages/service_share/service_share.js
  View file @16daf39
... ... @@ -363,7 +363,8 @@ Page({
363 363  
364 364 var app = getApp();
365 365 var unit = that.data.screenWidth / 750 * 1.35; //基础单位，
366   - var scene = th.data.share_good.goods_id+"";
  366 + var scene = th.data.share_good.goods_id?th.data.share_good.goods_id:th.data.share_good.id+"";
  367 +
367 368 var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
368 369 if(user_id>0){
369 370 scene+="_"+user_id;
... ... @@ -371,7 +372,7 @@ Page({
371 372  
372 373 ///二微码
373 374 var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
374   - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
  375 + os.stoid + "?sceneValue=" + scene + "&pageValue=packageA/pages/goodsInfo/goodsInfo";
375 376  
376 377 //读取文件成功则OK--
377 378 wx.getImageInfo({
... ...
packageD/pages/error/error.js 0 → 100644
  View file @16daf39
  1 +var t = require("../../../utils/common.js");var os=getApp().globalData.setting;
  2 +Page({
  3 + data:{
  4 + store:null,
  5 + imghots: os.imghost,
  6 + msg:"",
  7 + },
  8 +
  9 + onLoad:function(t){
  10 + getApp().err_going=1;
  11 + var th=this,app = getApp();
  12 + app.getConfig(function(e){
  13 + th.setData({ store:e,msg:t.msg});
  14 + wx.setNavigationBarTitle({
  15 + title: e.store_name//页面标题
  16 + })
  17 + })
  18 + },
  19 +
  20 + phone:function (){
  21 + if(this.data.msg.indexOf("可联系:")!=-1){
  22 + var tel=this.data.msg.split("可联系:")[1];
  23 + if(tel){
  24 + wx.makePhoneCall({
  25 + phoneNumber: tel,
  26 + })
  27 + }
  28 + }
  29 + }
  30 +
  31 +
  32 +});
... ...
packageD/pages/error/error.json 0 → 100644
  View file @16daf39
  1 +{}
0 2 \ No newline at end of file
... ...
packageD/pages/error/error.wxml 0 → 100644
  View file @16daf39
  1 +<view class="all_page">
  2 + <view class="content">
  3 + <view><image class='logo' src="{{imghots+store.store_logo}}"> </image></view>
  4 + <view class="title">{{store.store_name}}</view>
  5 + <view>{{store.store_desc}}</view>
  6 + <view bindtap="phone" class="err"><text>{{msg}}</text></view>
  7 + </view>
  8 +</view>
0 9 \ No newline at end of file
... ...
packageD/pages/error/error.wxss 0 → 100644
  View file @16daf39
  1 +.all_page{
  2 + position: fixed;
  3 + height: 100%;
  4 + width: 100%;
  5 + background: #fff;
  6 + justify-content: center;/*水平居中*/
  7 +}
  8 +.all_page .content{
  9 + font-size: 30rpx;
  10 + text-align: center;
  11 + height: 400px;
  12 + width: 100%;
  13 + position: absolute;
  14 + top: 50%;
  15 + margin-top:-200px;
  16 +}
  17 +.logo{width: 140rpx; height: 140rpx; border-radius:50% }
  18 +.all_page .content .title{
  19 + font-size: 36rpx; margin: 20rpx 0
  20 +}
  21 +
  22 +.all_page .err{
  23 + color:red;
  24 + font-size: 36rpx;
  25 + margin-top: 300rpx;
  26 +}
0 27 \ No newline at end of file
... ...
packageD/pages/user/deposit/deposit.js
  View file @16daf39
... ... @@ -89,4 +89,13 @@ Page({
89 89 onLoad: function (options) {
90 90  
91 91 },
  92 +
  93 + goto_nav: function (e) {
  94 + var th = this;
  95 + var itemid = e.currentTarget.dataset.itemid;
  96 + var url="query/index?itemid="+itemid;
  97 + console.log(url);
  98 + getApp().goto(url);
  99 +
  100 + },
92 101 })
... ...
packageD/pages/user/deposit/deposit.wxml
  View file @16daf39
... ... @@ -26,7 +26,7 @@
26 26 </view>
27 27 <view wx:else>
28 28 <block wx:for="{{list}}" wx:for-index="idx" wx:for-item="list">
29   - <view class="rim_one">
  29 + <view class="rim_one" data-itemid="{{list.AdvanceItemId}}" bindtap="goto_nav">
30 30 <view class="top_rim">{{list.ItemName}}</view>
31 31 <view class="bottom_rim">
32 32 <view class="bottom_one">￥{{list.Balance}}</view>
... ...
packageD/pages/user/deposit/filter.wxs 0 → 100644
  View file @16daf39
  1 +var numFr = {
  2 + getNum: function(x) {
  3 + var f = parseInt(x);
  4 + return f;
  5 + },
  6 + getval: function(x,n) {
  7 + var f = parseFloat(x);
  8 + f=f.toFixed(n);
  9 + return f;
  10 + }
  11 +}
  12 +module.exports = {
  13 + getNum: numFr.getNum,
  14 + getval: numFr.getval,
  15 +}
0 16 \ No newline at end of file
... ...
packageD/pages/user/deposit/query/index.js 0 → 100644
  View file @16daf39
  1 +var t = getApp(),
  2 + a = t.request,
  3 + o = t.globalData.setting,
  4 + os = o,
  5 + i = require("../../../../../utils/util.js"),
  6 + ut = i,
  7 + s = require("../../../../../utils/common.js");
  8 +var regeneratorRuntime = require('../../../../../utils/runtime.js');
  9 +Page({
  10 + data: {
  11 +
  12 + val: false,
  13 + color: "",
  14 + details: [], //数据
  15 + isBind: true, //控制清空时间日期的按钮
  16 + isBinds: true,
  17 + select: false, //下拉框控制器
  18 + datet: "",
  19 + dates: "",
  20 + result: [],
  21 + money: 0,
  22 + ItemInfo: "",
  23 + pageSize: 10,
  24 + page: 1,
  25 + current_page: 0,
  26 + //is_no_more: 0,
  27 + },
  28 +
  29 +
  30 + /**
  31 + * 生命周期函数--监听页面显示
  32 + */
  33 + onShow: function (options) {
  34 + wx.setNavigationBarTitle({
  35 + title: "储值款明细",
  36 + })
  37 + this.init();
  38 + },
  39 + //监听输入框显示清空按钮
  40 + watchPassWord: function(event) {
  41 + console.log("监听输入框显示清空按钮");
  42 + var val = event.detail.value;
  43 + console.log("是什么", val);
  44 + if (val != "" && val != null) {
  45 + var isBind = false;
  46 + this.setData({
  47 + isBind: isBind
  48 + });
  49 +
  50 + }
  51 + },
  52 + /**
  53 + * 点击下拉框
  54 + */
  55 + bindShowMsg() {
  56 + console.log(!this.data.select);
  57 + this.setData({
  58 + select: !this.data.select
  59 + })
  60 + },
  61 + /**
  62 + * 已选下拉框
  63 + */
  64 + mySelect(e) {
  65 + console.log(e)
  66 + var name = e.currentTarget.dataset.name
  67 + this.setData({
  68 + grade_name: name,
  69 + select: false
  70 + })
  71 + },
  72 + /**
  73 + * 生命周期函数--监听页面加载
  74 + */
  75 + onLoad: function(options) {
  76 + console.log(options);
  77 + // 设置日期选择器的结束时间为当前日期
  78 + var now=new Date();
  79 + var nowDate = now.getFullYear() + '-' + (now.getMonth() + 1) + '-' + now.getDate();
  80 + var date = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
  81 + var startDate=date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
  82 + this.setData({
  83 + ItemInfo:options.itemid,
  84 + datet:startDate,
  85 + dates:nowDate,
  86 + })
  87 + },
  88 + //明细查询
  89 + Gettime: function (e) {
  90 + var page = 0;
  91 + //开始获取时间
  92 + var th = this;
  93 + var datet= th.data.datet;
  94 + var dates= th.data.dates;
  95 + console.log(datet, "开始结束", dates);
  96 + //删除字符中的——
  97 + var datatk = datet.replace(/[-]/g, "");
  98 + //转换类型
  99 + var datak = parseInt(datatk);
  100 + //删除字符中的——
  101 + var dataj = dates.replace(/[-]/g, "");
  102 + //转换类型
  103 + var dataj = parseInt(dataj);
  104 +
  105 + console.log("开始", datak, "结束", dataj);
  106 + //判断初始时间小于结束时间
  107 + if (datak > dataj) {
  108 + console.log("开始时间", datak, '结束时间', dataj, "时间判断");
  109 + getApp().showWarning("结束时间错误");
  110 + this.setData({ details: [] });
  111 + } else {
  112 + this.setData({ details: [] });
  113 + console.log(datak, dataj, "时间判断2");
  114 + console.log("有进来吗", datet, dates);
  115 + this.setData({ current_page: 0 });
  116 + this.init();
  117 + }
  118 +
  119 + },
  120 +
  121 + async init() {
  122 +
  123 + var t=a;
  124 + this.data.current_page++;
  125 + var BeginDate = this.data.datet;
  126 + var EndDate = this.data.dates;
  127 + var user_id = getApp().globalData.user_id;
  128 + var store_id = os.stoid;
  129 + var tpye = this.data.grade_name;
  130 + console.log("ddd"+this.data.ItemInfo);
  131 + var e = this,
  132 + details = "";
  133 + var get_data = {
  134 + user_id: user_id, store_id: store_id,
  135 + ItemInfo:encodeURIComponent(this.data.ItemInfo),
  136 + pageSize: 10, page: e.data.current_page
  137 + };
  138 +
  139 +
  140 + if (EndDate != "" && EndDate != null) {
  141 + get_data.EndDate = EndDate;
  142 + }
  143 +
  144 + if (BeginDate != "" && BeginDate!= null) {
  145 + get_data.BeginDate = BeginDate;
  146 + }
  147 + var big_arr = this.data.details;
  148 + await getApp().request.promiseGet("/api/weshop/users/listAdvanceListSeek", {
  149 + data: get_data, isShowLoading: 1
  150 + }).then(res => {
  151 +
  152 +
  153 +
  154 + var details = res.data;
  155 + if (details.code!=0)
  156 + {
  157 + getApp().showWarning("找不到相关数据");
  158 + return false;
  159 + }
  160 + if (!details.data) {
  161 + getApp().showWarning("未找更多数据");
  162 + return false;
  163 + }
  164 + var details = details.data;
  165 +
  166 + details.forEach(function (val, ind) {
  167 + big_arr.push(val);
  168 + })
  169 + setTimeout(() => {
  170 + this.setData({
  171 + details: big_arr
  172 + });
  173 + }, 1500)
  174 +
  175 +
  176 + })
  177 + },
  178 +
  179 +
  180 + //起始时间
  181 + bindDateChenge: function(e) {
  182 + console.log("是什么", e.detail.value);
  183 + var isBind = false;
  184 + this.setData({
  185 + datet: e.detail.value,
  186 + isBind: isBind
  187 + });
  188 + },
  189 + // 结束时间
  190 + bindDateChenges: function(e) {
  191 + console.log("是什么", e.detail.value);
  192 + var isBinds = false;
  193 + this.setData({
  194 + dates: e.detail.value,
  195 + isBinds: isBinds
  196 + });
  197 + },
  198 + //catchtap阻止冒泡，点击清除开始时间的按钮
  199 + eliminate: function() {
  200 + console.log("试试");
  201 + var isBind = true;
  202 + var data = "";
  203 + this.setData({
  204 + datet: data,
  205 + isBind: isBind
  206 + })
  207 + },
  208 + //catchtap阻止冒泡，点击清除结束时间的按钮
  209 + eliminates: function() {
  210 + console.log("试试");
  211 + var isBinds = true;
  212 + var dates = "";
  213 + this.setData({
  214 + dates: dates,
  215 + isBinds: isBinds
  216 + })
  217 + }
  218 +
  219 +})
0 220 \ No newline at end of file
... ...
packageD/pages/user/deposit/query/index.json 0 → 100644
  View file @16daf39
  1 +{}
0 2 \ No newline at end of file
... ...
packageD/pages/user/deposit/query/index.wxml 0 → 100644
  View file @16daf39
  1 +<wxs module="filter" src="../filter.wxs"></wxs>
  2 +
  3 +<view class="big-rim">
  4 + <form bindsubmit='Gettime'>
  5 + <view class="min-rim">
  6 + <view class="rq">日期:</view>
  7 +
  8 + <picker class='pi' mode="date" value='{{datet}}' start="2019/1/1" bindchange='bindDateChenge'>
  9 + <view class="rq-rim">
  10 + <view class='kssj'><text class="wz"name="datat"value='{{datet}}'bindinput='watchPassWord'>{{datet}}</text></view>
  11 + <!-- 清除输入框中的内容-->
  12 + <view hidden='{{isBind}}' class="qc-rim">
  13 + <button class="empty" catchtap="eliminate">x</button>
  14 + </view>
  15 + </view>
  16 + </picker>
  17 +
  18 + <view class="zi">至 </view>
  19 + <picker class="pis"mode="date" value='{{dates}}' start="2019/1/1" end="" bindchange='bindDateChenges'>
  20 + <view class="kssj">
  21 + <text class='wz' name="datas" value='{{dates}}'>{{dates}}</text>
  22 + </view>
  23 + <!-- 清除输入框中的内容 -->
  24 + <view class="end-rim" hidden="{{isBinds}}">
  25 + <button class="end" catchtap="eliminates">x</button>
  26 + </view>
  27 + </picker>
  28 + </view>
  29 +
  30 + <button class="botton" form-type='submit' data-query='{{item}}'>查询明细</button>
  31 + </form>
  32 +
  33 +</view>
  34 +
  35 +<view class="db">
  36 + <view class="xm">项目</view>
  37 + <view class="je">余额</view>
  38 +</view>
  39 +
  40 +
  41 +<view wx:if="{{details.length!=0}}">
  42 + <block wx:for="{{details}}" wx:for-index="idx" wx:for-item="details">
  43 + <view class="data">
  44 + <view class="left">
  45 + <view class='left-test'>{{details.BillName}}
  46 + <view class='time'>{{details.BillDate}}</view>
  47 + </view>
  48 + </view>
  49 + <view class="val" style='color:{{(details.InSum>0)?"green":""}}'>
  50 + {{(details.InSum>0)?"+"+filter.getNum(details.InSum):"-"+filter.getNum(details.OutSum)}}元
  51 + </view>
  52 + </view>
  53 + </block>
  54 +
  55 +</view>
0 56 \ No newline at end of file
... ...
packageD/pages/user/deposit/query/index.wxss 0 → 100644
  View file @16daf39
  1 +/* 大边框 */
  2 +.big-rim{
  3 + margin-top: 15rpx;
  4 + width: 100%;
  5 + height: 200rpx;
  6 + border-bottom: 8px solid #EEEEEE;
  7 +}
  8 +/* 单据时间 */
  9 +.time{
  10 +
  11 + font-size: 25rpx;
  12 + color: #999999;
  13 + width: 100%;
  14 +}
  15 +.min-rim{
  16 +display: flex;
  17 +width: 100%;
  18 +height: auto;
  19 +margin-left: 30rpx;
  20 +}
  21 +/* 日期 */
  22 +.rq{
  23 + height: 25rpx;
  24 + font-size: 28rpx;
  25 + margin-top:12rpx;
  26 + font-family:'SimHei',Arial;
  27 +}
  28 +/* 日期控件 */
  29 +.pi{
  30 + width:200rpx;
  31 + height:auto;
  32 + margin-left:10rpx;
  33 +
  34 +}
  35 +.pis{
  36 + width:200rpx;
  37 + height:auto;
  38 + margin-left:30rpx;
  39 +}
  40 +/* 日期边框 */
  41 +.rq-rim{
  42 +position:relative;
  43 +left:0;
  44 +top:0
  45 +}
  46 +/* 开始时间边框*/
  47 +.kssj{
  48 +display: inline-block;
  49 +height: 50rpx;
  50 +padding: 4rpx;
  51 +background-color: #EEEEEE;
  52 +border: 1px solid #DADADA;
  53 +width:200rpx;
  54 +border-radius: 3px;
  55 +line-height:40rpx;
  56 +position:relative;
  57 +top:0rpx;
  58 +left:0rpx;
  59 +
  60 +}
  61 +/* 开始时间的文字 */
  62 +.wz{
  63 + display: inline-block;
  64 +font-size: 25rpx;
  65 +color: #333;
  66 +}
  67 +/* 开始清空按钮的 边框*/
  68 +.qc-rim{
  69 + position:absolute;
  70 + top:10rpx;
  71 + left:173rpx;
  72 +
  73 +}
  74 +/* 结束时间清空输入框的按钮的边框 */
  75 +.end-rim{
  76 +position: absolute;
  77 + top: 23rpx;
  78 + left:547rpx;
  79 + width: 25rpx;
  80 + height: 25rpx;
  81 +}
  82 +/* 查询内容 */
  83 +.cxnr{
  84 + margin-left:30rpx;
  85 + font-size:28rpx;
  86 + font-family: 'SimHei',Arial;
  87 +}
  88 +/* 至 */
  89 +.zi{
  90 + margin-top:14rpx;
  91 + font-weight:600;
  92 + font-size:28rpx;
  93 + font-family: 'SimHei',Arial;
  94 + margin-left:30rpx;
  95 +}
  96 +/* 结束时间 */
  97 +
  98 +.jssj{
  99 + padding-left: 10rpx;
  100 + margin-left: 30rpx;
  101 +padding-bottom: 10rpx;
  102 +height: 35rpx;
  103 +font-size: 25rpx;
  104 +color: #333;
  105 +background-color: #EEEEEE;
  106 +border: 1px solid #DADADA;
  107 +width:85%;
  108 +border-radius: 5px;
  109 +
  110 +}
  111 +/* 查询内容的备考的边框 */
  112 +.xknr-rim{
  113 + display: flex;
  114 + width: 100%;
  115 + height: 55rpx;
  116 + line-height:105rpx;
  117 + margin-top:20rpx;
  118 +}
  119 +/* 明细查询 */
  120 +.botton{
  121 + margin-left: 30rpx;
  122 + margin-top: 50rpx;
  123 + background-color: #C4182E;
  124 + width: 95%;
  125 + border-radius:10rpx;
  126 + text-align: center;
  127 + height: 70rpx;
  128 + line-height: 70rpx;
  129 + color: #FFF;
  130 + font-size: 29rpx;
  131 + border: none;
  132 + font-family: 'SimHei',Arial;
  133 + }
  134 + /* 底部边框线
  135 + .bottom{
  136 + width: 100%;
  137 + border-bottom: 20rpx solid #eeeeee;
  138 + } */
  139 +
  140 +/*开始时间清空输入框的按钮*/
  141 +.empty{
  142 + width: 25rpx;
  143 + height: 25rpx;
  144 + border-radius:50%;
  145 + background: #767676;
  146 + color: #fff;
  147 + font-size: 25rpx;
  148 + text-align: center;
  149 + line-height:19rpx;
  150 +}
  151 +/*结束时间清空输入框的按钮*/
  152 +.end{
  153 + width: 25rpx;
  154 + height: 25rpx;
  155 + border-radius:50%;
  156 + background: #767676;
  157 + color: #fff;
  158 + font-size: 25rpx;
  159 + text-align: center;
  160 + line-height:19rpx;
  161 +
  162 +}
  163 +
  164 +/* 顶部 */
  165 +.top{
  166 + width: 170rpx;
  167 + height: 50rpx;
  168 + padding: 0 10rpx;
  169 + line-height: 50rpx;
  170 + font-size: 34rpx;
  171 + margin-top: 25rpx;
  172 + border-radius:3rpx;
  173 +}
  174 +.images{
  175 + width:35rpx;
  176 +height:35rpx;
  177 +margin-left:-9rpx;
  178 +margin-top:6rpx;
  179 +}
  180 +.rim-images{
  181 + width: 62rpx;
  182 + height: 46rpx;
  183 + line-height: 37rpx;
  184 + /* border-style: inset;padding:4rpx;text-align: center; */
  185 + background: #f1f1f1;
  186 + border-color:#000000;
  187 + border-width: 1rpx;
  188 + transform:translateX(28%);
  189 + margin-top:-3rpx;
  190 +border-radius:5rpx;
  191 +}
  192 +/* 下拉框 */
  193 +.top-selected{
  194 + width: 100%;
  195 + display: flex;
  196 + align-items: center;
  197 + justify-content: space-between;
  198 + border: 1px solid #ccc;
  199 + padding: 0 10rpx;
  200 + font-size: 30rpx;
  201 + background:#eeeeee;
  202 + height:50rpx;
  203 + border-radius:6rpx;
  204 +
  205 +}
  206 +.texts{
  207 + margin:0 auto;
  208 + font-size: 25rpx;
  209 +
  210 +}
  211 +/* 下拉内容 */
  212 +/* 下拉内容 */
  213 +.select-box {
  214 + background-color: #eeeeee;
  215 + width:190rpx;
  216 + position: relative;
  217 + z-index:1;
  218 + overflow: hidden;
  219 + text-align: left;
  220 + animation: myfirst 0.5s;
  221 + font-size: 25rpx;
  222 + border: 1px solid #DADADA;
  223 +}
  224 +.select_one {
  225 + padding-left: 20rpx;
  226 + width: 100%;
  227 + height: 60rpx;
  228 + line-height: 60rpx;
  229 +}
  230 +/* 优惠券样式 */
  231 +.body{
  232 + text-align: center;
  233 + padding: 20rpx;
  234 + margin: 20rpx auto;
  235 + width: 80%;
  236 + max-width: 1000rpx;
  237 + font-size: 28rpx;
  238 + color: #333333;
  239 + border-bottom: 2rpx solid #EEEEEE;
  240 +}
  241 +
  242 +.b_iimg{
  243 + background-color: red;
  244 + width: 400rpx;
  245 + height: 400rpx;
  246 +}
  247 +
  248 +.b_sz2{
  249 + font-size: 40rpx;
  250 + color: #6fd137;
  251 + margin: 20rpx 0;
  252 + text-align: center;
  253 +}
  254 +
  255 +/* 注释 */
  256 + .zs{
  257 + margin-left: 30rpx;
  258 + font-size: 25rpx;
  259 + color: #999999;
  260 + font-family: 'SimHei',Arial;
  261 + margin-top: 42rpx;
  262 + margin-bottom: 30rpx;
  263 + }
  264 + /* 项目边框 */
  265 + .db{
  266 + display: flex;
  267 + width: 100%;
  268 + height: 85rpx;
  269 + border-bottom: 2rpx solid #e8e8e8;
  270 + line-height: 85rpx;
  271 +}
  272 +/* 项目 */
  273 +.xm{
  274 +margin-left: 30rpx;
  275 + height:50rpx;
  276 + font-size: 30rpx;
  277 +color: #999999;
  278 +width: 50%;
  279 +vertical-align: middle;
  280 +}
  281 +/* 金额 */
  282 +.je{
  283 +text-align: right;
  284 +padding-right:120rpx;
  285 +height: 50rpx;
  286 + font-size: 30rpx;
  287 +color: #999999;
  288 +width: 50%;
  289 +vertical-align: middle;
  290 +
  291 +}
  292 +
  293 +/*数据*/
  294 +.data{
  295 + display: flex;
  296 + width: 100%;
  297 + border-bottom: 1px solid #E8E8E8;
  298 + height: 95rpx;
  299 +}
  300 +/*左边的数据 */
  301 +.left{
  302 + width:90%;
  303 + height: 120rpx;
  304 +}
  305 +/* 单据单号 */
  306 +.left-test{
  307 + margin-left: 30rpx;
  308 + padding-top: 11rpx;
  309 + font-size: 25rpx;
  310 + color: #000000;
  311 + width: 100%;
  312 +}
  313 +
  314 +/* 流动资金的加减 */
  315 +.val{
  316 + padding-top:20rpx;
  317 + padding-right:10rpx;
  318 + height: 70rpx;
  319 + width: 220rpx;
  320 + font-size: 30rpx;
  321 + font-family: 'SimHei',Arial;
  322 + padding-left:67rpx;
  323 +
  324 +}
0 325 \ No newline at end of file
... ...
pages/giftpack/evaluategift/evaluategift.js
  View file @16daf39
... ... @@ -200,7 +200,7 @@ Page({
200 200 th.setData({
201 201 receiveState: 1
202 202 })
203   - getApp().my_warnning("领取成功", 1, th);
  203 + getApp().my_warnning("领取成功，同一个订单评价后只能兑换一份礼包！", 1, th);
204 204 } else {
205 205 getApp().my_warnning(res.data.msg, 0, th);
206 206 }
... ...
pages/giftpack/giftpacklist/giftpacklist.js
  View file @16daf39
... ... @@ -249,6 +249,10 @@ Page({
249 249 var t_date = new Date(t_endtime) / 1000;
250 250 var t_now = ut.gettimestamp();
251 251  
  252 + var t_starttime = res.data.data.starTime;
  253 + t_starttime = t_starttime.replace(/-/g, '/');
  254 + var t_sdate = new Date(t_starttime) / 1000;
  255 +
252 256 if (res.data.data.goodsUseState) th.setData({
253 257 c_state: 1
254 258 })
... ... @@ -256,7 +260,10 @@ Page({
256 260 th.setData({
257 261 c_state: 2
258 262 })
259   -
  263 + else if (t_sdate > t_now)
  264 + th.setData({
  265 + c_state: -1
  266 + })
260 267 th.setData({
261 268 giftDate: res.data.data.endTime,
262 269 giftPosPrice: res.data.data.giftPosPrice,
... ...
pages/giftpack/giftpacklist/giftpacklist.wxml
  View file @16daf39
... ... @@ -183,6 +183,9 @@
183 183 </view>
184 184 </block>
185 185 <block wx:else>
  186 + <view wx:if="{{c_state==-1}}" class="foot_button_buy data-v-3a5b7e36 overdue" >
  187 + <text class="data-v-3a5b7e36">兑换未开始</text>
  188 + </view>
186 189 <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
187 190 <text class="data-v-3a5b7e36">立即使用</text>
188 191 </view>
... ...
pages/index/index/index.js
  View file @16daf39
... ... @@ -714,11 +714,11 @@ Page({
714 714 setappdata: function (t) {
715 715 if (t && t.isout == 1)
716 716 wx.reLaunch({
717   - url: "/pages/error/error?msg=该商城已到期，暂停浏览！\r\n可联系:" + getApp().globalData.config.store_tel,
  717 + url: "/packageD/pages/error/error?msg=该商城已到期，暂停浏览！\r\n可联系:" + getApp().globalData.config.store_tel,
718 718 });
719 719 if (t && t.isbuy == 0)
720 720 wx.reLaunch({
721   - url: "/pages/error/error?msg=还未购买小程序",
  721 + url: "/packageD/pages/error/error?msg=还未购买小程序",
722 722 });
723 723 },
724 724 //---加载更多是靠这个函数----
... ...
pages/user/index/filter.wxs
  View file @16daf39
... ... @@ -18,6 +18,7 @@ var is_close = function (name,c_list) {
18 18 map['充值有礼']="16";
19 19 map['幸运大转盘']="17";
20 20 map['幸运购']="18";
  21 + map['套盒商品']="19";
21 22 map['AI测肤']="20";
22 23 map['附近门店']="21";
23 24 var index=map[name];
... ...
pages/user/index/index.js
  View file @16daf39
... ... @@ -485,11 +485,11 @@ Page({
485 485 var t = getApp().globalData.wxapp_buy_obj;
486 486 if (t && t.isout == 1)
487 487 wx.navigateTo({
488   - url: "/pages/error/error?msg=小程序已经过期",
  488 + url: "/packageD/pages/error/error?msg=小程序已经过期",
489 489 });
490 490 if (t && t.isbuy == 0)
491 491 wx.navigateTo({
492   - url: "/pages/error/error?msg=还未购买小程序",
  492 + url: "/packageD/pages/error/error?msg=还未购买小程序",
493 493 });
494 494 },
495 495  
... ...