miniprogram / binhaineigouopen · 提交

转到一个项目

作者 朱振飞
提交 4fa067f8e2a6e66d2bcfe6608dee69f37f648685 1 个父辈 0f27e037

121

内嵌 并排对比
正在显示 37 个修改的文件 包含 1230 行增加 和 28 行删除
@@ -4,14 +4,22 @@ Component({ @@ -4,14 +4,22 @@ Component({
4 * 组件的属性列表 4 * 组件的属性列表
5 */ 5 */
6 properties: { 6 properties: {
7 - 7 + tel: {
  8 + type: Number, // 接收父组件传过来的值
  9 + value: ''
  10 + },
8 }, 11 },
9 12
10 /** 13 /**
11 * 组件的初始数据 14 * 组件的初始数据
12 */ 15 */
13 data: { 16 data: {
14 - 17 + },
  18 + onLoad(){
  19 + this.setData({
  20 + tel:wx.getStorageSync('tel')
  21 + })
  22 + console.log(this.data.tel)
15 }, 23 },
16 24
17 /** 25 /**
@@ -19,6 +27,8 @@ Component({ @@ -19,6 +27,8 @@ Component({
19 */ 27 */
20 methods: { 28 methods: {
21 tel(){ 29 tel(){
  30 + console.log(1212)
  31 + console.log(this.data.tel)
22 wx.makePhoneCall({ 32 wx.makePhoneCall({
23 phoneNumber: wx.getStorageSync('tel') 33 phoneNumber: wx.getStorageSync('tel')
24 }) 34 })
@@ -47,10 +47,10 @@ App({ @@ -47,10 +47,10 @@ App({
47 // 滨海 47 // 滨海
48 var entrance_type = wx.getStorageSync("entrance_type"); 48 var entrance_type = wx.getStorageSync("entrance_type");
49 console.log(entrance_type); 49 console.log(entrance_type);
50 - if (entrance_type == '1' || url == '/getopenid/get' || url.indexOf('address') > -1) { 50 + if (entrance_type == '1' || url == '/getopenid/get' || url.indexOf('address') > -1 || url.indexOf('/wb/wb')>-1) {
51 //劳保商城入口 51 //劳保商城入口
52 - baseUrl = 'https://binhai.w.broing.cn/api';  
53 - } else if (entrance_type == '2') { 52 + baseUrl = 'https://binhai.w.broing.cn/api';
  53 + } else if (entrance_type == '2') {
54 //工会商城入口 54 //工会商城入口
55 baseUrl = 'https://binhaigh.w.broing.cn/api'; 55 baseUrl = 'https://binhaigh.w.broing.cn/api';
56 } else if (entrance_type == '3') { 56 } else if (entrance_type == '3') {
@@ -44,6 +44,9 @@ @@ -44,6 +44,9 @@
44 "root": "packageA", 44 "root": "packageA",
45 "pages": [ 45 "pages": [
46 "pages/index/index", 46 "pages/index/index",
  47 + "pages/choujiang/choujiang",
  48 + "pages/rule/rule",
  49 + "pages/record/record",
47 "pages/register/register", 50 "pages/register/register",
48 "pages/login/login", 51 "pages/login/login",
49 "pages/startindex/startindex", 52 "pages/startindex/startindex",
@@ -74,7 +77,7 @@ @@ -74,7 +77,7 @@
74 "pages/taocanpay/taocanpay", 77 "pages/taocanpay/taocanpay",
75 "pages/orderdetail/orderdetail", 78 "pages/orderdetail/orderdetail",
76 "pages/xianshi/xianshi" 79 "pages/xianshi/xianshi"
77 - ] 80 + ]
78 } 81 }
79 ], 82 ],
80 "preloadRule":{ 83 "preloadRule":{
  1 +const app = getApp()
  2 +let timer;
  3 +let cjIn = false;
  4 +let cjChange = 0; //抽奖过程KEY
  5 +var interval = null;
  6 +Page({
  7 +
  8 + /**
  9 + * 页面的初始数据
  10 + */
  11 + data: {
  12 + prizeList: [{
  13 + id: '001',
  14 + index: 1,
  15 + imgsrc: '/images/shoubiao.png',
  16 + prizeName: '奖品名称111'
  17 + },
  18 + {
  19 + id: '002',
  20 + index: 2,
  21 + imgsrc: '/images/shoubiao.png',
  22 + prizeName: '奖品名称222'
  23 + },
  24 + {
  25 + id: '003',
  26 + index: 3,
  27 + imgsrc: '/images/shoubiao.png',
  28 + prizeName: '奖品名称333'
  29 + },
  30 + {
  31 + id: '004',
  32 + index: 4,
  33 + imgsrc: '/images/shoubiao.png',
  34 + prizeName: '奖品名称444'
  35 + },
  36 + {
  37 + id: '005',
  38 + index: 5,
  39 + imgsrc: '/images/shoubiao.png',
  40 + prizeName: '奖品名称555'
  41 + },
  42 + {
  43 + id: '006',
  44 + index: 6,
  45 + imgsrc: '/images/shoubiao.png',
  46 + prizeName: '奖品名称666'
  47 + },
  48 + {
  49 + id: '007',
  50 + index: 7,
  51 + imgsrc: '/images/shoubiao.png',
  52 + prizeName: '奖品名称777'
  53 + },
  54 + {
  55 + id: '008',
  56 + index: 8,
  57 + imgsrc: '/images/shoubiao.png',
  58 + prizeName: '奖品名称88888888888888'
  59 + },
  60 + ],
  61 +
  62 + cjChange: null, //抽奖过程KEY
  63 + prizeResult: null, //抽奖结果KEY
  64 + prizeName: null, //抽奖结果KEY对应的奖品名称
  65 +
  66 + showAgain: false, //是否抽奖后显示再抽一次按钮
  67 + choujiang: false,
  68 + listzhong: [],
  69 + residue_total: '',
  70 + days: '',
  71 + hours: '',
  72 + minutes: '',
  73 + seconds: '',
  74 + beginchou: true,
  75 + text: ''
  76 +
  77 + },
  78 +
  79 + // 获取信息
  80 + getinfo() {
  81 + let that = this;
  82 + let url = '/gift/get_setting'
  83 + let params = {
  84 +
  85 + }
  86 + app.post(url, params).then((res) => {
  87 + console.log(res, 373784478)
  88 + that.setData({
  89 + residue_total: res.msg.residue_total
  90 + })
  91 + if (res.msg.residue_time == 0) {
  92 + that.setData({
  93 + beginchou: false
  94 + })
  95 + }
  96 +
  97 +
  98 + var totalSecond = res.msg.residue_time;
  99 + // var totalSecond = r.countdown;
  100 + interval = setInterval(function () {
  101 + // 秒数
  102 + var second = totalSecond;
  103 +
  104 + // 天数位
  105 + var day = Math.floor(second / 3600 / 24);
  106 + var dayStr = day.toString();
  107 + if (dayStr.length == 1) dayStr = '0' + dayStr;
  108 + // 小时位
  109 + var hr = Math.floor((second - day * 3600 * 24) / 3600);
  110 + var hrStr = hr.toString();
  111 + if (hrStr.length == 1) hrStr = '0' + hrStr;
  112 + // 分钟位
  113 + var min = Math.floor((second - day * 3600 * 24 - hr * 3600) / 60);
  114 + var minStr = min.toString();
  115 + if (minStr.length == 1) minStr = '0' + minStr;
  116 + // 秒位
  117 + var sec = second - day * 3600 * 24 - hr * 3600 - min * 60;
  118 + var secStr = sec.toString();
  119 + if (secStr.length == 1) secStr = '0' + secStr;
  120 + that.setData({
  121 + days: dayStr,
  122 + hours: hrStr,
  123 + minutes: minStr,
  124 + seconds: secStr,
  125 + })
  126 +
  127 +
  128 +
  129 + totalSecond--;
  130 + if (totalSecond <= 0) {
  131 + clearInterval(interval);
  132 + // uni.showToast({
  133 + // title: '活动已结束',
  134 + // icon: 'none'
  135 + // });
  136 + // 倒计时结束
  137 + //that.countDown();
  138 + that.setData({
  139 + days: "00",
  140 + hours: "00",
  141 + minutes: "00",
  142 + seconds: "00",
  143 + beginchou: false
  144 + // endactive:true
  145 + })
  146 + }
  147 + }.bind(this), 1000);
  148 + })
  149 + },
  150 + // 开始抽奖
  151 + startchou() {
  152 + wx.showToast({
  153 + title: '抽奖还未开始，敬请期待',
  154 + icon: 'none'
  155 + })
  156 + },
  157 + // 活动规则
  158 + guize() {
  159 + wx.navigateTo({
  160 + url: '/packageA/pages/rule/rule',
  161 + })
  162 + },
  163 + // 中奖纪录
  164 + zhongjilu() {
  165 + wx.navigateTo({
  166 + url: '/packageA/pages/record/record',
  167 + })
  168 + },
  169 +
  170 + // 获取礼物的接口
  171 + getpresent() {
  172 + let that = this;
  173 + let url = '/gift/get_gift'
  174 + let params = {
  175 +
  176 + }
  177 + app.post(url, params).then((res) => {
  178 + console.log(res)
  179 +
  180 + that.setData({
  181 + prizeList: res.msg
  182 + })
  183 +
  184 + let newprizeList = that.data.prizeList;
  185 + newprizeList.forEach(function (value, index, array) {
  186 + value.index = index + 1
  187 + })
  188 +
  189 + that.setData({
  190 + prizeList: newprizeList
  191 + })
  192 + })
  193 + },
  194 +
  195 +
  196 +
  197 +
  198 +
  199 +
  200 + //抽奖操作
  201 + cj() {
  202 + console.log(38483484)
  203 + // if(cjIn){
  204 + // console.log(9999)
  205 + // return;
  206 + // }else{
  207 + // cjIn = true;
  208 + // }
  209 +
  210 + let This = this;
  211 + This.setData({
  212 + // 不能再抽奖
  213 + choujiang: true
  214 + })
  215 +
  216 +
  217 + // 获取抽到的礼物
  218 + let url = '/gift/extract'
  219 + let params = {
  220 +
  221 + }
  222 + let res = {}
  223 + app.post(url, params).then((res) => {
  224 + console.log(res)
  225 + This.setData({
  226 + text: res
  227 + })
  228 +
  229 + let newprizeList = This.data.prizeList;
  230 + newprizeList.forEach(function (value, index, array) {
  231 + if (value.id == res.msg.id) {
  232 + console.log(value)
  233 + res = {
  234 + stutus: 1,
  235 + prizeResult: value.index,
  236 + prizeName: value.name,
  237 +
  238 + }
  239 +
  240 + console.log(666554433, res)
  241 + if (res.stutus == 1) {
  242 + setTimeout(function () {
  243 + clearInterval(timer);
  244 + timer = setInterval(This.changePrize, 160);
  245 + setTimeout(function () {
  246 + clearInterval(timer);
  247 + timer = setInterval(This.changePrize, 300);
  248 +
  249 + setTimeout(function () {
  250 + This.setData({
  251 + prizeResult: res.prizeResult,
  252 + prizeName: res.prizeName,
  253 + });
  254 +
  255 +
  256 +
  257 + }, 1000)
  258 + }, 1000)
  259 + }, 2000)
  260 +
  261 + cjIn = false;
  262 + cjChange = 0; //抽奖过程KEY
  263 +
  264 +
  265 + This.setData({
  266 + cjChange: null, //抽奖过程KEY
  267 + prizeResult: null, //抽奖结果KEY
  268 + prizeName: null, //抽奖结果KEY对应的奖品名称
  269 + showAgain: false, //是否抽奖后显示再抽一次按钮
  270 + });
  271 + }
  272 + clearInterval(timer);
  273 + timer = setInterval(This.changePrize, 80);
  274 +
  275 + }
  276 + })
  277 + }).catch((err) => {
  278 + console.log(err)
  279 + This.setData({
  280 + // 可再次抽奖
  281 + choujiang: false,
  282 + cjIn: false
  283 + })
  284 + console.log(This.data.choujiang)
  285 +
  286 + })
  287 +
  288 +
  289 +
  290 +
  291 +
  292 +
  293 + // test start
  294 + // res = {
  295 + // stutus:1,
  296 + // prizeResult:1,
  297 + // prizeName:'奖品名称88888888888888',
  298 +
  299 + // }
  300 + // console.log(999999,res)
  301 +
  302 + // test end
  303 +
  304 +
  305 +
  306 + },
  307 + //抽奖过程奖品切换
  308 + changePrize() {
  309 + cjChange++;
  310 + cjChange = cjChange > 8 ? 1 : cjChange;
  311 +
  312 + let This = this;
  313 + This.setData({
  314 + cjChange: cjChange
  315 + });
  316 +
  317 + if (This.data.prizeResult == cjChange) {
  318 + clearInterval(timer);
  319 + This.setData({
  320 + showAgain: true,
  321 + // 可以再次抽奖
  322 + choujiang: false
  323 + });
  324 + if (This.data.text.msg.id == 8) {
  325 + wx.showToast({
  326 + title: '很遗憾,您没有中奖~',
  327 + icon: 'none'
  328 + })
  329 + } else {
  330 + wx.showToast({
  331 + title: '恭喜您中了' + text.msg.name + '奖品',
  332 + icon: 'none'
  333 + })
  334 + }
  335 +
  336 + This.getinfo()
  337 + This.zhongjianglist()
  338 + console.log('获得奖品：' + This.data.prizeName)
  339 + }
  340 + },
  341 + //点击再抽一次按钮
  342 + againBtn() {
  343 + cjIn = false;
  344 + cjChange = 0; //抽奖过程KEY
  345 +
  346 + let This = this;
  347 + This.setData({
  348 + cjChange: null, //抽奖过程KEY
  349 + prizeResult: null, //抽奖结果KEY
  350 + prizeName: null, //抽奖结果KEY对应的奖品名称
  351 + showAgain: false, //是否抽奖后显示再抽一次按钮
  352 + });
  353 + },
  354 + /**
  355 + * 生命周期函数--监听页面加载
  356 + */
  357 + onLoad: function (options) {
  358 +
  359 + },
  360 +
  361 + /**
  362 + * 生命周期函数--监听页面初次渲染完成
  363 + */
  364 + onReady: function () {
  365 +
  366 + },
  367 +
  368 + /**
  369 + * 生命周期函数--监听页面显示
  370 + */
  371 + onShow: function () {
  372 + this.getpresent();
  373 + // 获取中将记录
  374 + this.zhongjianglist()
  375 + // 获取信息
  376 + this.getinfo()
  377 + },
  378 + // 获取中奖名单
  379 + getzhongjianlist() {
  380 +
  381 + let that = this;
  382 +
  383 + let url = '/gift/get_gift_log1'
  384 + let params = {
  385 +
  386 + }
  387 + console.log(999999999)
  388 + app.post(url, params).then((res) => {
  389 + console.log(res, 中奖纪录)
  390 +
  391 +
  392 + })
  393 + },
  394 +
  395 + // 获取礼物的接口
  396 + zhongjianglist() {
  397 + console.log(347883443)
  398 + let that = this;
  399 + let url = '/gift/get_gift_log1'
  400 + let params = {
  401 +
  402 + }
  403 + app.post(url, params).then((res) => {
  404 + console.log(res)
  405 + that.setData({
  406 + listzhong: res.msg
  407 + })
  408 +
  409 +
  410 + })
  411 + },
  412 +
  413 +
  414 + /**
  415 + * 生命周期函数--监听页面隐藏
  416 + */
  417 + onHide: function () {
  418 +
  419 + },
  420 +
  421 + /**
  422 + * 生命周期函数--监听页面卸载
  423 + */
  424 + onUnload: function () {
  425 +
  426 + },
  427 +
  428 + /**
  429 + * 页面相关事件处理函数--监听用户下拉动作
  430 + */
  431 + onPullDownRefresh: function () {
  432 +
  433 + },
  434 +
  435 + /**
  436 + * 页面上拉触底事件的处理函数
  437 + */
  438 + onReachBottom: function () {
  439 +
  440 + },
  441 +
  442 + /**
  443 + * 用户点击右上角分享
  444 + */
  445 + onShareAppMessage: function () {
  446 +
  447 + }
  448 +})
  1 +{
  2 + "usingComponents": {}
  3 +}
  1 +<view class="chouimg">
  2 + <image src="https://binhai.w.broing.cn/image/b22ca3fa145158a572f9bf6953bfaab.png" mode="widthFix"></image>
  3 + <view class="remaincishu">您还有{{residue_total}}次抽奖机会</view>
  4 + <view class="pagebox">
  5 + <view class="box">
  6 + <view bindtap="{{choujiang==false?'cj':''}}" class="list">
  7 + <image src="/images/chou.png"></image>
  8 + </view>
  9 + <block wx:for="{{prizeList}}">
  10 + <view class="list {{cjChange == item.index ? 'change_in' : ''}}">
  11 + <view class="list_t">
  12 + <image src="{{item.image}}" mode="aspectFit"></image>
  13 + </view>
  14 + <view class="list_b">{{item.name}}</view>
  15 + </view>
  16 + </block>
  17 + </view>
  18 + </view>
  19 +
  20 + <!-- 中奖名单 -->
  21 + <view class="zhonglist">
  22 + <view class="zhongtitle">
  23 + <text class="zhongleft">中奖</text>
  24 + <text class="zhongright">名单</text>
  25 + </view>
  26 + <view class="zhongbox">
  27 + <view class="zhongboxitem" wx:for="{{listzhong}}" wx:key="">
  28 + <view class="zhongboxleft flexone">
  29 + <view class="zhongtou">
  30 + <image src="{{item.image}}"></image>
  31 + </view>
  32 + <view class="zhongname">{{item.user_name}}</view>
  33 + </view>
  34 + <view class="zhongmiddle">{{item.name}}</view>
  35 + <view class="zhongrightk">{{item.tel}}</view>
  36 + </view>
  37 +
  38 +
  39 +
  40 + </view>
  41 + </view>
  42 +
  43 + <!-- 中奖 -->
  44 + <view class="prise">
  45 + <view class="jilu" bindtap="zhongjilu">
  46 + <view class="priseleft">
  47 + <image src="/images/jilu.png"></image>
  48 + </view>
  49 + <view class="zhongjilu">中奖记录</view>
  50 + </view>
  51 + <view class="jilu" bindtap="guize">
  52 + <view class="priseright">
  53 + <image src="/images/mingdan.png"></image>
  54 + </view>
  55 + <view class="huodongrule">活动规则</view>
  56 + </view>
  57 +
  58 + </view>
  59 +
  60 +</view>
  61 +
  62 +<!-- 倒计时弹层 -->
  63 +<view class="register" wx:if="{{beginchou}}" catchtouchmove="true">
  64 + <view class="daowrap">
  65 + <image src="https://binhai.w.broing.cn/image/2d2481f1d7b95dd65feb853e7a7d243.png" mode="widthFix"></image>
  66 + </view>
  67 + <view class="daojitime">
  68 + <view class="hourtime hourday">{{days}}</view>
  69 + <view class="hourtime hourhour">{{hours}}</view>
  70 + <view class="hourtime hourminute">{{minutes}}</view>
  71 + <view class="hourtime hoursecond">{{seconds}}</view>
  72 +
  73 + </view>
  74 +
  75 + <view class="anniu" bindtap="startchou">
  76 + <image src="/images/anniu.png"></image>
  77 + </view>
  78 +
  79 + <!-- 叉号 -->
  80 + <!-- <view class="chahao">
  81 + <image src="/images/chahao.png"></image>
  82 + </view> -->
  83 +</view>
  1 +page{
  2 + width:100%;
  3 + height:100vh
  4 +}
  5 +.remaincishu{
  6 + color:#FB5A44;
  7 + font-size: 32rpx;
  8 + font-weight: bold;
  9 + position: absolute;
  10 + top:476rpx;
  11 + left:228rpx;
  12 + letter-spacing: 2rpx;
  13 +}
  14 +.chouimg{
  15 + width:100%;
  16 + /* height:100vh; */
  17 + position: relative;
  18 +/* background:url('https://binhai.w.broing.cn/image/b22ca3fa145158a572f9bf6953bfaab.png')no-repeat center;
  19 +background-size:100% 100%; */
  20 +
  21 +
  22 +
  23 +}
  24 +image{
  25 + width:100%;
  26 + height:100%;
  27 +}
  28 +
  29 +.box{ width: 566rpx; height:472rpx; margin: 0 auto; box-sizing: border-box; position: relative;
  30 +
  31 +
  32 +}
  33 +.pagebox{
  34 + position: absolute;
  35 + top:599rpx;
  36 + left:92rpx;
  37 +}
  38 +.list{ width: 185rpx; height: 153rpx; position: absolute; background-color: transparent;
  39 + display: flex; flex-direction: column; flex-wrap: wrap; justify-content: center; align-content: center; align-items: center;
  40 + border-radius: 20rpx;
  41 + display:flex;
  42 + flex-direction: column;
  43 + align-items: center;
  44 + justify-content: center;
  45 +}
  46 +/* 抽奖过程中选定样式 */
  47 +.list.change_in{ color: #fff; background-color: #3D9AF9;}
  48 +.list_t{ width: 89rpx; height: 96rpx;}
  49 +.list_t image{ width: 100%; height: 100%;}
  50 +.list_b{ width: 90%; text-align: center; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
  51 +color:#DA321B;
  52 +font-size: 20rpx;
  53 +font-weight: bold;
  54 +}
  55 +/* 根据TOP */
  56 +.list:nth-child(1){ left: 50%; top: 50%; color: #fff; background-color: #1CBBB4;
  57 + display: flex; justify-content: center; align-content: center; align-items: center;
  58 + -webkit-transform: translate(-50%,-50%);
  59 + transform: translate(-50%,-50%);
  60 +}
  61 +.list.grey:nth-child(1){ background-color: #5F9EA0;}
  62 +.list:nth-child(2) , .list:nth-child(3) , .list:nth-child(4){ top: 0;}
  63 +.list:nth-child(6) , .list:nth-child(7) , .list:nth-child(8){ bottom: 0;}
  64 +.list:nth-child(5) , .list:nth-child(9){ top: 50%;
  65 + -webkit-transform: translateY(-50%);
  66 + transform: translateY(-50%);
  67 +}
  68 +/* 根据LEFT */
  69 +.list:nth-child(2) , .list:nth-child(8) , .list:nth-child(9){ left: 0;}
  70 +.list:nth-child(3) , .list:nth-child(7){ left: 50%;
  71 + -webkit-transform: translateX(-50%);
  72 + transform: translateX(-50%);
  73 +}
  74 +.list:nth-child(4) , .list:nth-child(5) , .list:nth-child(6){ right: 0;}
  75 +
  76 +/* 中奖名单 */
  77 +.zhongtitle{
  78 + display:flex;
  79 + align-items: center;
  80 + justify-content: center;
  81 +}
  82 +.zhongleft{
  83 + color:#FB5A44;
  84 + font-size: 32rpx;
  85 + font-weight: bold;
  86 +}
  87 +.zhongright{
  88 + color:#333;
  89 + font-size: 32rpx;
  90 + font-weight: bold;
  91 +}
  92 +.zhonglist{
  93 + position: absolute;
  94 + bottom:52rpx;
  95 + left:52rpx;
  96 + width:640rpx;
  97 +
  98 +}
  99 +.zhongboxitem{
  100 + display:flex;
  101 + align-items: center;
  102 + justify-content: space-around;
  103 + margin-bottom:12rpx
  104 +}
  105 +.zhongtou{
  106 + width:52rpx;
  107 + height:52rpx;
  108 + font-size: 0;
  109 + border-radius: 50%;
  110 + margin-right:22rpx;
  111 +}
  112 +.zhongtou image{
  113 + width:100%;
  114 + height:100%;
  115 + border-radius: 50%;
  116 +}
  117 +.zhongname{
  118 + /* width:173rpx; */
  119 + overflow: hidden;
  120 + text-overflow: ellipsis;
  121 + white-space: nowrap;
  122 + color:#333;
  123 + font-size: 24rpx;
  124 +}
  125 +.zhongmiddle{
  126 + color:#FB5A44;
  127 + font-size: 24rpx;
  128 +}
  129 +.zhongrightk{
  130 + color:#333;
  131 + font-size: 24rpx;
  132 +}
  133 +.zhongbox{
  134 + padding: 20rpx;
  135 + box-sizing: border-box;
  136 + border: 4rpx solid #FB5A44;
  137 + border-radius: 20rpx;
  138 + margin-top: 20rpx;
  139 + height:300rpx;
  140 + overflow-y: scroll;
  141 +}
  142 +.prise{
  143 + width:640rpx;
  144 + display:flex;
  145 + align-items: center;
  146 + justify-content: space-between;
  147 + position: absolute;
  148 + bottom:-23rpx;
  149 + left:52rpx;
  150 +}
  151 +.priseleft{
  152 + width:72rpx;
  153 + height:72rpx;
  154 + background:#FD3217;
  155 + border-radius: 50%;
  156 + display:flex;
  157 + align-items: center;
  158 + justify-content: center;
  159 +}
  160 +.priseleft image{
  161 + width:38rpx;
  162 + height:38rpx;
  163 +}
  164 +.jilu{
  165 + display:flex;
  166 + flex-direction: column;
  167 + align-items: center;
  168 + justify-content: center;
  169 +}
  170 +.priseright{
  171 + width:72rpx;
  172 + height:72rpx;
  173 + background:#3D9AF9;
  174 + border-radius: 50%;
  175 + display:flex;
  176 + align-items: center;
  177 + justify-content: center;
  178 +}
  179 +.priseright image{
  180 + width:38rpx;
  181 + height:38rpx;
  182 +}
  183 +.zhongjilu{
  184 + color:#FD3217;
  185 + font-size: 28rpx;
  186 +}
  187 +.huodongrule{
  188 + color:#3D9AF9;
  189 + font-size: 28rpx;
  190 +}
  191 +.daowrap{
  192 + width:100%;
  193 + height:100%;
  194 + position: relative;
  195 + z-index:-2;
  196 +
  197 +
  198 +}
  199 +.daojitime{
  200 + display:flex;
  201 + align-items: center;
  202 +
  203 + z-index: 999;
  204 + color:#fff;
  205 + font-size: 40rpx;
  206 +
  207 +}
  208 +.hourday{
  209 + position: absolute;
  210 + top:415rpx;
  211 + left:172rpx;
  212 +}
  213 +.hourhour{
  214 + position: absolute;
  215 + top:415rpx;
  216 + left:285rpx;
  217 +}
  218 +.hourminute{
  219 + position: absolute;
  220 + top:415rpx;
  221 + left:394rpx;
  222 +}
  223 +.hoursecond{
  224 + position: absolute;
  225 + top:415rpx;
  226 + left:509rpx;
  227 +}
  228 +.anniu{
  229 + width:305rpx;
  230 + height:121rpx;
  231 + font-size: 0;
  232 + position: absolute;
  233 + bottom:306rpx;
  234 + left:235rpx;
  235 +}
  236 +.chahao{
  237 + width:78rpx;
  238 + height:78rpx;
  239 + font-size: 0;
  240 + position: absolute;
  241 + bottom:120rpx;
  242 + left:340rpx;
  243 +}
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <view class='left'> 13 <view class='left'>
14 <view class='left_item {{status == index?"active":""}}' id='Nav{{index}}' wx:for='{{nav_arr}}' wx:key='index' bindtap='{{item.id!=""?"click_category":"seltaocan"}}' data-index='{{index}}' data-id='{{item.id}}'>{{item.name}}</view> 14 <view class='left_item {{status == index?"active":""}}' id='Nav{{index}}' wx:for='{{nav_arr}}' wx:key='index' bindtap='{{item.id!=""?"click_category":"seltaocan"}}' data-index='{{index}}' data-id='{{item.id}}'>{{item.name}}</view>
15 15
16 - <!-- <view class='left_item {{taocan == true?"active":""}}' bindtap="seltaocan">套餐专区</view> --> 16 + <view class='left_item {{taocan == true?"active":""}}' wx:if="{{taocanlist.length>0}}" bindtap="seltaocan">套餐专区</view>
17 17
18 18
19 </view> 19 </view>
@@ -20,7 +20,7 @@ Page({ @@ -20,7 +20,7 @@ Page({
20 paynum: 'paynum desc', //销量排序方式 20 paynum: 'paynum desc', //销量排序方式
21 stick: 0, 21 stick: 0,
22 activity: [], 22 activity: [],
23 - xianshilist: [], 23 + xianshilist: [{}],
24 day: '', 24 day: '',
25 hou: '', 25 hou: '',
26 min: '', 26 min: '',
@@ -152,7 +152,12 @@ Page({ @@ -152,7 +152,12 @@ Page({
152 wx.navigateTo({ 152 wx.navigateTo({
153 url: '/packageA/pages/zuji/zuji', 153 url: '/packageA/pages/zuji/zuji',
154 }) 154 })
  155 + }else if(index==7){
  156 + wx.navigateTo({
  157 + url: '/packageA/pages/choujiang/choujiang',
  158 + })
155 } 159 }
  160 +
156 } else if (wx.getStorageSync("token") && index == 5) { 161 } else if (wx.getStorageSync("token") && index == 5) {
157 // 跳转关于列表 162 // 跳转关于列表
158 wx.navigateTo({ 163 wx.navigateTo({
@@ -130,6 +130,12 @@ @@ -130,6 +130,12 @@
130 </view> 130 </view>
131 <image src="/images/youjiantou.png" class="youjiantou" /> 131 <image src="/images/youjiantou.png" class="youjiantou" />
132 </view> 132 </view>
  133 + <view class="item" bindtap="jumpListFun" data-t="7">
  134 + <view class="left">
  135 + <image src="/images/choujiang.png" style="width:30rpx;height:30rpx;" />转盘抽奖
  136 + </view>
  137 + <image src="/images/youjiantou.png" class="youjiantou" />
  138 + </view>
133 </view> 139 </view>
134 </view> 140 </view>
135 <concat /> 141 <concat />
  1 +// pages/message/message.js
  2 +const app = getApp()
  3 +Page({
  4 +
  5 + /**
  6 + * 页面的初始数据
  7 + */
  8 + data: {
  9 + page: 1,
  10 + listzhong: [],
  11 + },
  12 +
  13 + /**
  14 + * 生命周期函数--监听页面加载
  15 + */
  16 + onLoad: function(options) {
  17 +
  18 + },
  19 +
  20 + getmessagelist() {
  21 + let that = this
  22 + let url = '/gift/get_gift_log2';
  23 + let data = {
  24 + page:that.data.page,
  25 + pageNum:10
  26 +
  27 + }
  28 + app.post(url, data, "POST").then((r) => {
  29 + console.log(r)
  30 + that.setData({
  31 + listzhong:that.data.listzhong.concat(r.msg)
  32 + })
  33 +
  34 + console.log('34893489',that.data.listzhong)
  35 +
  36 +
  37 +
  38 +
  39 + }).catch((err) => {})
  40 + },
  41 +
  42 +
  43 +
  44 + /**
  45 + * 生命周期函数--监听页面初次渲染完成
  46 + */
  47 + onReady: function() {
  48 +
  49 + },
  50 +
  51 + /**
  52 + * 生命周期函数--监听页面显示
  53 + */
  54 + onShow: function() {
  55 + this.getmessagelist()
  56 + },
  57 +
  58 + /**
  59 + * 生命周期函数--监听页面隐藏
  60 + */
  61 + onHide: function() {
  62 +
  63 + },
  64 +
  65 + /**
  66 + * 生命周期函数--监听页面卸载
  67 + */
  68 + onUnload: function() {
  69 +
  70 + },
  71 +
  72 + /**
  73 + * 页面相关事件处理函数--监听用户下拉动作
  74 + */
  75 + onPullDownRefresh: function() {
  76 +
  77 + },
  78 +
  79 + /**
  80 + * 页面上拉触底事件的处理函数
  81 + */
  82 + onReachBottom: function() {
  83 + let newpage = this.data.page;
  84 + newpage++;
  85 + this.setData({
  86 + page: newpage
  87 + })
  88 + this.getmessagelist()
  89 + },
  90 +
  91 + /**
  92 + * 用户点击右上角分享
  93 + */
  94 + onShareAppMessage: function() {
  95 +
  96 + }
  97 +})
  1 +{
  2 + "navigationBarTitleText": "中奖记录"
  3 +}
  1 +
  2 +
  3 +
  4 + <view class="empty" wx:if="{{listzhong.length==0}}">暂无更多数据</view>
  5 +
  6 + <view class="zhongbox" wx:else>
  7 + <view class="zhongboxitem" wx:for="{{listzhong}}" wx:key="">
  8 + <view class="zhongboxleft flexone">
  9 + <view class="zhongtou">
  10 + <image src="{{item.image}}"></image>
  11 + </view>
  12 + <view class="zhongname">{{item.user_name}}</view>
  13 + </view>
  14 + <view class="zhongmiddle">{{item.name}}</view>
  15 + <view class="zhongrightk">{{item.tel}}</view>
  16 + </view>
  17 +
  18 +
  19 +
  20 + </view>
  21 +
  22 +
  1 +page {
  2 + background: #f9f9f9;
  3 +}
  4 +
  5 +.messagelist {
  6 + width: 686rpx;
  7 + border-radius: 20rpx;
  8 + background: #fff;
  9 + margin: 20rpx auto 0;
  10 +}
  11 +
  12 +.mssageitem {
  13 + padding: 32rpx 32rpx;
  14 + box-sizing: border-box;
  15 +
  16 + border-radius: 10rpx;
  17 + border-bottom: 1rpx solid #f5f5f5;
  18 +}
  19 +
  20 +.messtopleft {
  21 + color: rgba(19, 26, 46, 1);
  22 + font-size: 28rpx;
  23 +}
  24 +
  25 +.activeleft {
  26 + position: relative;
  27 +}
  28 +
  29 +.messtopleft:before {
  30 + display: block;
  31 + content: '';
  32 + position: absolute;
  33 + left:-15rpx;
  34 + top:50%;
  35 + width:10rpx;
  36 + height:10rpx;
  37 + border-radius: 50%;
  38 + background: #FF0000;
  39 + transform: translateY(-50%)
  40 +
  41 +}
  42 +
  43 +.messtopright, .messagename {
  44 + color: #939a9e;
  45 + font-size: 28rpx;
  46 +}
  47 +
  48 +.messagename {
  49 + margin-top: 10rpx;
  50 + word-break:break-all
  51 +}
  52 +.no_login{
  53 + font-size: 36rpx;
  54 + font-family: PingFang SC;
  55 + font-weight: 400;
  56 + color: #ccc;
  57 + margin-top: 200rpx;
  58 + text-align: center;
  59 +}
  60 +
  61 +/* 中奖名单 */
  62 +.zhongtitle{
  63 + display:flex;
  64 + align-items: center;
  65 + justify-content: center;
  66 +}
  67 +.zhongleft{
  68 + color:#FB5A44;
  69 + font-size: 32rpx;
  70 + font-weight: bold;
  71 +}
  72 +.zhongright{
  73 + color:#333;
  74 + font-size: 32rpx;
  75 + font-weight: bold;
  76 +}
  77 +.zhonglist{
  78 + position: absolute;
  79 + bottom:52rpx;
  80 + left:52rpx;
  81 + width:640rpx;
  82 +
  83 +}
  84 +.zhongboxitem{
  85 + display:flex;
  86 + align-items: center;
  87 + justify-content: space-between;
  88 + margin-bottom:21rpx
  89 +}
  90 +.zhongtou{
  91 + width:52rpx;
  92 + height:52rpx;
  93 + font-size: 0;
  94 + border-radius: 50%;
  95 + margin-right:22rpx;
  96 +}
  97 +.zhongtou image{
  98 + width:100%;
  99 + height:100%;
  100 + border-radius: 50%;
  101 +}
  102 +.zhongname{
  103 + /* width:173rpx; */
  104 + overflow: hidden;
  105 + text-overflow: ellipsis;
  106 + white-space: nowrap;
  107 + color:#333;
  108 + font-size: 24rpx;
  109 +}
  110 +.zhongmiddle{
  111 + color:#FB5A44;
  112 + font-size: 24rpx;
  113 +}
  114 +.zhongrightk{
  115 + color:#333;
  116 + font-size: 24rpx;
  117 +}
  118 +.zhongbox{
  119 + padding: 20rpx;
  120 + box-sizing: border-box;
  121 +
  122 + border-radius: 20rpx;
  123 + margin-top: 20rpx;
  124 +
  125 +}
  126 +.prise{
  127 + width:640rpx;
  128 + display:flex;
  129 + align-items: center;
  130 + justify-content: space-between;
  131 + position: absolute;
  132 + bottom:-23rpx;
  133 + left:52rpx;
  134 +}
  135 +.priseleft{
  136 + width:72rpx;
  137 + height:72rpx;
  138 + background:#FD3217;
  139 + border-radius: 50%;
  140 + display:flex;
  141 + align-items: center;
  142 + justify-content: center;
  143 +}
  144 +.priseleft image{
  145 + width:38rpx;
  146 + height:38rpx;
  147 +}
  148 +.jilu{
  149 + display:flex;
  150 + flex-direction: column;
  151 + align-items: center;
  152 + justify-content: center;
  153 +}
  154 +.priseright{
  155 + width:72rpx;
  156 + height:72rpx;
  157 + background:#3D9AF9;
  158 + border-radius: 50%;
  159 + display:flex;
  160 + align-items: center;
  161 + justify-content: center;
  162 +}
  163 +.priseright image{
  164 + width:38rpx;
  165 + height:38rpx;
  166 +}
  167 +.zhongjilu{
  168 + color:#FD3217;
  169 + font-size: 28rpx;
  170 +}
  171 +.huodongrule{
  172 + color:#3D9AF9;
  173 + font-size: 28rpx;
  174 +}
  1 +// pages/rule/rule.js
  2 +const app=getApp()
  3 +Page({
  4 +
  5 + /**
  6 + * 页面的初始数据
  7 + */
  8 + data: {
  9 + content:''
  10 + },
  11 +
  12 + // 获取信息
  13 + getinfo(){
  14 + let that=this;
  15 + let url ='/gift/get_setting'
  16 + let params = {
  17 +
  18 + }
  19 + app.post(url, params).then((res) => {
  20 + console.log(res,373784478)
  21 + that.setData({
  22 + content:res.msg.content
  23 + })
  24 +
  25 +
  26 +
  27 +
  28 + })
  29 + },
  30 +
  31 + /**
  32 + * 生命周期函数--监听页面加载
  33 + */
  34 + onLoad: function (options) {
  35 + this.getinfo()
  36 + },
  37 +
  38 + /**
  39 + * 生命周期函数--监听页面初次渲染完成
  40 + */
  41 + onReady: function () {
  42 +
  43 + },
  44 +
  45 + /**
  46 + * 生命周期函数--监听页面显示
  47 + */
  48 + onShow: function () {
  49 +
  50 + },
  51 +
  52 + /**
  53 + * 生命周期函数--监听页面隐藏
  54 + */
  55 + onHide: function () {
  56 +
  57 + },
  58 +
  59 + /**
  60 + * 生命周期函数--监听页面卸载
  61 + */
  62 + onUnload: function () {
  63 +
  64 + },
  65 +
  66 + /**
  67 + * 页面相关事件处理函数--监听用户下拉动作
  68 + */
  69 + onPullDownRefresh: function () {
  70 +
  71 + },
  72 +
  73 + /**
  74 + * 页面上拉触底事件的处理函数
  75 + */
  76 + onReachBottom: function () {
  77 +
  78 + },
  79 +
  80 + /**
  81 + * 用户点击右上角分享
  82 + */
  83 + onShareAppMessage: function () {
  84 +
  85 + }
  86 +})
  1 +{
  2 + "usingComponents": {}
  3 +}
  1 +<view class="contentbox">
  2 + <rich-text nodes="{{content}}"></rich-text>
  3 +</view>
  1 +.contentbox{
  2 + padding: 32rpx;
  3 + box-sizing: border-box;
  4 +}
@@ -11,6 +11,7 @@ Page({ @@ -11,6 +11,7 @@ Page({
11 status: 0, 11 status: 0,
12 nav: ['商品介绍', '规格参数', '售后保障'], 12 nav: ['商品介绍', '规格参数', '售后保障'],
13 mask: false, 13 mask: false,
  14 + buyStatus: 0,
14 taocanlist:[] 15 taocanlist:[]
15 }, 16 },
16 num_change(e) { 17 num_change(e) {
@@ -44,7 +45,7 @@ Page({ @@ -44,7 +45,7 @@ Page({
44 look_more(e) { 45 look_more(e) {
45 let id = e.currentTarget.dataset.id 46 let id = e.currentTarget.dataset.id
46 wx.navigateTo({ 47 wx.navigateTo({
47 - url: '/pages/shop_detail/shop_detail?id=' + id 48 + url: '/packageA/pages/shop_detail/shop_detail?id=' + id
48 }) 49 })
49 }, 50 },
50 //添加购物车 51 //添加购物车
@@ -74,13 +75,13 @@ Page({ @@ -74,13 +75,13 @@ Page({
74 num: that.data.num 75 num: that.data.num
75 } 76 }
76 wx.navigateTo({ 77 wx.navigateTo({
77 - url: '/pages/taocanpay/taocanpay?' + '&info=' + JSON.stringify(info) + '&id=' + that.data.info.id 78 + url: '/packageA/pages/taocanpay/taocanpay?' + '&info=' + JSON.stringify(info) + '&id=' + that.data.info.id
78 }) 79 })
79 }, 80 },
80 //去查看购物车 81 //去查看购物车
81 go_car() { 82 go_car() {
82 wx.switchTab({ 83 wx.switchTab({
83 - url: '/pages/shop_cart/shop_cart' 84 + url: '/packageA/pages/shop_cart/shop_cart'
84 }) 85 })
85 }, 86 },
86 //收藏 87 //收藏
@@ -115,9 +116,9 @@ Page({ @@ -115,9 +116,9 @@ Page({
115 }, 116 },
116 117
117 change_cover(e) { 118 change_cover(e) {
118 - if( app.globalData.status==0){ 119 + if( this.data.buyStatus==0){
119 wx.showToast({ 120 wx.showToast({
120 - title: '您已您所在单位暂未开始劳保购买！', 121 + title: '您已您所在单位暂未开放购买！',
121 icon:'none' 122 icon:'none'
122 }) 123 })
123 return false 124 return false
@@ -143,7 +144,8 @@ Page({ @@ -143,7 +144,8 @@ Page({
143 app.post(url, params).then((res) => { 144 app.post(url, params).then((res) => {
144 this.setData({ 145 this.setData({
145 info: res.msg.data, 146 info: res.msg.data,
146 - taocanlist:res.msg.product 147 + taocanlist:res.msg.product,
  148 + buyStatus: res.msg.data.status
147 }) 149 })
148 WxParse.wxParse('contenta', 'html', res.msg.maincontent, this, 5) 150 WxParse.wxParse('contenta', 'html', res.msg.maincontent, this, 5)
149 WxParse.wxParse('contenb', 'html', res.msg.guigecontent, this, 5) 151 WxParse.wxParse('contenb', 'html', res.msg.guigecontent, this, 5)
@@ -83,7 +83,7 @@ Page({ @@ -83,7 +83,7 @@ Page({
83 // 去添加地址 83 // 去添加地址
84 add_address() { 84 add_address() {
85 wx.navigateTo({ 85 wx.navigateTo({
86 - url: '/pages/address/address', 86 + url: '/packageA/pages/address/address',
87 }) 87 })
88 }, 88 },
89 89
@@ -89,7 +89,7 @@ Page({ @@ -89,7 +89,7 @@ Page({
89 }) 89 })
90 }else{ 90 }else{
91 wx.navigateTo({ 91 wx.navigateTo({
92 - url: '/pages/taocandetail/taocandetail?id=' + id 92 + url: '/packageA/pages/taocandetail/taocandetail?id=' + id
93 }) 93 })
94 } 94 }
95 95
@@ -34,6 +34,7 @@ Page({ @@ -34,6 +34,7 @@ Page({
34 pid: '', 34 pid: '',
35 logok: '', 35 logok: '',
36 selected: 0, 36 selected: 0,
  37 + tel:'',
37 list: [{ 38 list: [{
38 pagePath: "/pages/index/index", 39 pagePath: "/pages/index/index",
39 text: "商品", 40 text: "商品",
@@ -79,6 +80,8 @@ Page({ @@ -79,6 +80,8 @@ Page({
79 seltui: index 80 seltui: index
80 }) 81 })
81 }, 82 },
  83 + // 关于我们
  84 +
82 // 进入商品列表 85 // 进入商品列表
83 cityTap(e) { 86 cityTap(e) {
84 console.log(e) 87 console.log(e)
@@ -339,13 +342,12 @@ Page({ @@ -339,13 +342,12 @@ Page({
339 342
340 // 获取活动专区 343 // 获取活动专区
341 this.getzhuanqulist(); 344 this.getzhuanqulist();
342 - this.getxianshi(); 345 + // this.getxianshi();
343 setTimeout(function () { 346 setTimeout(function () {
344 that.setData({ 347 that.setData({
345 showtime: true 348 showtime: true
346 }) 349 })
347 }, 990) 350 }, 990)
348 -  
349 this.getpinpailist() 351 this.getpinpailist()
350 } 352 }
351 //控制显示隐藏 353 //控制显示隐藏
@@ -353,9 +355,13 @@ Page({ @@ -353,9 +355,13 @@ Page({
353 // 我写的项目 355 // 我写的项目
354 356
355 357
356 -  
357 }, 358 },
358 - 359 + onReady(){
  360 + this.setData({
  361 + tel: wx.getStorageSync('tel')
  362 + })
  363 + console.log(this.data.tel)
  364 + },
359 // 获取一级分类 365 // 获取一级分类
360 getonkind() { 366 getonkind() {
361 let that = this; 367 let that = this;
@@ -462,7 +468,7 @@ Page({ @@ -462,7 +468,7 @@ Page({
462 // 控制活动专区和限时抢购显示隐藏 468 // 控制活动专区和限时抢购显示隐藏
463 ishow() { 469 ishow() {
464 let that = this 470 let that = this
465 - let url = '//wb/wb'; 471 + let url = '/wb/wb';
466 let data = { 472 let data = {
467 473
468 } 474 }
@@ -471,9 +477,10 @@ Page({ @@ -471,9 +477,10 @@ Page({
471 that.setData({ 477 that.setData({
472 status1: r.msg.status1, 478 status1: r.msg.status1,
473 status2: r.msg.status2, 479 status2: r.msg.status2,
474 - title2: r.msg.title2 480 + title2: r.msg.title2,
  481 + tel:r.msg.tel
475 }) 482 })
476 - 483 + wx.setStorageSync('tel', r.msg.tel)
477 484
478 485
479 }).catch((err) => { }) 486 }).catch((err) => { })
@@ -238,7 +238,7 @@ @@ -238,7 +238,7 @@
238 <view wx:else class="noData">暂无相关产品</view> 238 <view wx:else class="noData">暂无相关产品</view>
239 239
240 </view> 240 </view>
241 - <concat /> 241 + <concat :tel='{{tel}}'></concat>
242 </view> 242 </view>
243 </view> 243 </view>
244 244
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 "checkInvalidKey": true, 20 "checkInvalidKey": true,
21 "checkSiteMap": true, 21 "checkSiteMap": true,
22 "uploadWithSourceMap": true, 22 "uploadWithSourceMap": true,
23 - "compileHotReLoad": false, 23 + "compileHotReLoad": true,
24 "lazyloadPlaceholderEnable": false, 24 "lazyloadPlaceholderEnable": false,
25 "useMultiFrameRuntime": true, 25 "useMultiFrameRuntime": true,
26 "useApiHook": true, 26 "useApiHook": true,
@@ -30,7 +30,6 @@ @@ -30,7 +30,6 @@
30 "disablePlugins": [], 30 "disablePlugins": [],
31 "outputPath": "" 31 "outputPath": ""
32 }, 32 },
33 - "enableEngineNative": false,  
34 "useIsolateContext": false, 33 "useIsolateContext": false,
35 "userConfirmedBundleSwitch": false, 34 "userConfirmedBundleSwitch": false,
36 "packNpmManually": false, 35 "packNpmManually": false,
@@ -39,10 +38,11 @@ @@ -39,10 +38,11 @@
39 "disableUseStrict": false, 38 "disableUseStrict": false,
40 "minifyWXML": true, 39 "minifyWXML": true,
41 "showES6CompileOption": false, 40 "showES6CompileOption": false,
42 - "useCompilerPlugins": false 41 + "useCompilerPlugins": false,
  42 + "ignoreUploadUnusedFiles": true
43 }, 43 },
44 "compileType": "miniprogram", 44 "compileType": "miniprogram",
45 - "libVersion": "2.19.6", 45 + "libVersion": "2.22.0",
46 "appid": "wx73497072e7340d61", 46 "appid": "wx73497072e7340d61",
47 "projectname": "binhaineigouopen", 47 "projectname": "binhaineigouopen",
48 "debugOptions": { 48 "debugOptions": {