作者 杨世雄

ysx

正在显示 63 个修改的文件 包含 996 行增加225 行删除
{
"pages": [
"pages/home/home",
"pages/stores/index",
"pages/shopCart/shopCart",
... ... @@ -132,6 +133,21 @@
"navigationBarTextStyle": "black",
"enablePullDownRefresh": false
},
"subPackages": [
{
"root": "package",
"pages":[
"pages/LuckDraw/LuckDraw",
"pages/getwl/getwl"
]
}
],
"preloadRule": {
"pages/home/home": {
"network": "all",
"packages": ["package"]
}
},
"tabBar": {
"color": "#8C9198",
"backgroundColor": "#fff",
... ...
... ... @@ -13,7 +13,7 @@
.draw_alert_box .draw_alert {
width: 500rpx;
height: 700rpx;
background-image: url(https://car.goorcar.com/assets/draw3/zu10458@2x.png);
background-image: url(https://car.goorcar.com/assets/draw3/diyongquan_img@2x.png);
background-size: contain;
margin: 0 auto;
position: fixed;
... ... @@ -30,17 +30,15 @@
transform: translateX(-24rpx);
}
.draw_alert_box .draw_alert .checkgift {
background-image: url(https://car.goorcar.com/assets/draw3/zixun_btn@2x.png);
height: 53rpx;
line-height: 53rpx;
height: 68rpx;
line-height: 68rpx;
border-radius: 34rpx;
background: linear-gradient(90.00deg, #fe965b 0%, #fe3d22 100%);
text-align: center;
width: 320rpx;
font-size: 24rpx;
font-weight: 500;
color: #251a1a;
text-shadow: 0rpx 8rpx 8rpx 0rpx rgba(188, 76, 20, 0.65);
background-size: contain;
background-repeat: no-repeat;
color: #fff;
position: absolute;
bottom: 100rpx;
left: 50%;
... ... @@ -49,7 +47,7 @@
.draw_alert_box .draw_alert .draw_alert_text {
font-size: 28rpx;
font-weight: 500;
color: #ffffff;
color: #29313D;
position: absolute;
top: 250rpx;
left: 85rpx;
... ...
... ... @@ -17,9 +17,9 @@
.timeItem .timeBg {
width: 36rpx;
height: 40rpx;
background: #675b8d;
background:rgba(255,227,191,0.5);
border-radius: 8rpx;
color: #fff;
color: #FF521B;
text-align: center;
line-height: 40rpx;
margin-right: 5rpx;
... ...
import {
request
} from "../../request/index.js";
var WxParse = require('../../wxParse/wxParse.js');
} from "../../../request/index.js";
var WxParse = require('../../../wxParse/wxParse.js');
const a = getApp()
// pages/LuckDraw/LuckDraw.js
Page({
... ... @@ -13,7 +13,7 @@ Page({
// 活动id
id: 0,
// 活动个人信息
userMsg:'',
userMsg: '',
// 顾问id
advisers_id: 0,
// 抽奖总数据
... ... @@ -23,8 +23,9 @@ Page({
content: '',
// 奖品列表
awardList: [],
DrawList: ['关于小象', '活动规则', '获奖记录'],
DrawList: ['关于同放', '活动规则', '获奖记录'],
imagesUrl: a.globalData.baseUrl,
newurl:'www.xiaoxiangauto.com',
// 新增
titleName: '',
showBindPhone: false,
... ... @@ -196,10 +197,11 @@ Page({
*/
onLoad: function (e) {
wx.setStorageSync('drawId', e.id)
this.setData({
userMsg:JSON.parse(e.userMsg)
})
console.log(e, this.data.userMsg,'传递的抽奖id')
if (e.userMsg) {
this.setData({
userMsg: JSON.parse(e.userMsg)
})
}
if (e.id != undefined) {
this.setData({
id: e.id
... ... @@ -221,7 +223,6 @@ Page({
brand2: wx.getStorageSync('brand2'),
brandId2: wx.getStorageSync('brandId2')
})
console.log(this.data.brand, this.data.brandId, '选中的品牌,抽奖页')
},
// 获取抽奖页数据
... ... @@ -239,8 +240,6 @@ Page({
})
let countdownPer = parseFloat((data.all_time - data.sheng_time) / data.all_time).toFixed(2)
console.log(countdownPer, "剩余时间百分比")
console.log(data.all_time, data.sheng_time, '总时间和剩余时间')
that.setData({
indexData: data,
// 奖品列表
... ... @@ -248,7 +247,6 @@ Page({
content: data.detail,
countdownPer: countdownPer
})
WxParse.wxParse('content', 'html', that.data.content, that, 25);
if (that.data.lun_arr.length > 0) {
//奖品item设置
... ... @@ -313,6 +311,7 @@ Page({
startGame: function () {
console.log(this.data.isRunning, this.data.sheng_time <= 0, this.data.indexData.sheng_time == -2, this.data.awardList.length != 12)
console.log(this.data.sheng_time,this.data.indexData.sheng_time,this.data.awardList)
if (this.data.isRunning || this.data.sheng_time <= 0 || this.data.indexData.sheng_time == -2 || this.data.awardList.length != 12) return;
console.log('通过初始化')
console.log(this.data.isRunning, this.data.sheng_time <= 0, this.data.indexData.sheng_time == -2, this.data.awardList.length != 12)
... ... @@ -330,7 +329,6 @@ Page({
this.setData({
isRunning: true
})
console.log('启动抽奖')
//获取奖品
request({
url: 'api/h5/chou',
... ... @@ -341,7 +339,6 @@ Page({
this.setData({
chou: res.data.data
})
console.log(this.data.chou, '获取奖品')
})
var _this = this;
... ... @@ -362,7 +359,6 @@ Page({
}
//这里我只是简单粗暴用y=30*x+200函数做的处理.可根据自己的需求改变转盘速度
if (rooNum > 20 && _this.data.lun_arr[indexSelect].id == _this.data.chou.id) {
console.log(_this.data.lun_arr[indexSelect].id, _this.data.chou.id, '停止条件')
// var contentTxt = ''
// var btn = {
// btnName: '去分享',
... ... @@ -508,7 +504,7 @@ Page({
if (type == 0) {
this.setData({
titleName: '关于小象',
titleName: '关于同放',
showActRule: true
})
} else if (type == 1) {
... ... @@ -518,7 +514,7 @@ Page({
})
} else if (type == 2) {
wx.navigateTo({
url: '/pages/myPrize/myPrize?drawid=' + this.data.id + '&userMsg='+ JSON.stringify(this.data.userMsg),
url: '/pages/myPrize/myPrize?drawid=' + this.data.id + '&userMsg=' + JSON.stringify(this.data.userMsg),
})
}
},
... ...
{
"usingComponents": {
"countdown":"../../components/countdown/countdown",
"index-draw-alert":"../../components/Draw/index_draw_alert/index_draw_alert",
"get-prize":"../../components/Draw/getPrize/getPrize"
"countdown":"../../../components/countdown/countdown",
"index-draw-alert":"../../../components/Draw/index_draw_alert/index_draw_alert",
"get-prize":"../../../components/Draw/getPrize/getPrize"
}
}
\ No newline at end of file
... ...
<import src="../../../wxParse/wxParse.wxml" />
<view class="box">
<!-- <image class="banner" src="{{imagesUrl}}assets/static/img/MaskGroup@2x.png"></image> -->
<view class="banner">
<swiper class="b-swiper" indicator-dots="true" autoplay="true" circular="true" >
<swiper class="b-swiper" indicator-dots="true" autoplay="true" circular="true">
<swiper-item wx:for="{{indexData.banner_img_arr}}" wx:key="index" class="b-swiper-item">
<image src="{{item}}" class="b-swiper-item-img"></image>
</swiper-item>
... ... @@ -18,7 +19,7 @@
<!-- <video></video> -->
</view>
<!-- 抽奖区 -->
<view class="draw b" style="background-image: url({{imagesUrl}}assets/static/img/Group745@2x.png);">
<view class="draw b" style="background-image: url({{imagesUrl}}assets/static/img/Group770@2x.png);">
<!-- 规则 -->
<view class="rule">
<view class="rule-in" wx:for="{{DrawList}}" wx:key="index" data-idx="{{index}}" bindtap="clickActRule">
... ... @@ -43,8 +44,11 @@
<view class="startDraw b" style="background-image: url({{imagesUrl}}assets/static/img/Group744@2x.png);"
bindtap="startGame"></view>
</view>
<!-- <view class="pic b" style="background-image: url({{imagesUrl}}assets/draw3/Group753@2x.png);margin-left: 160rpx;"></view> -->
<!-- <image src="{{imagesUrl}}assets/draw3/Group753@2x.png" class="pic" ></image> -->
<!-- 倒计时 -->
<view class="countDown b" style="background-image: url({{imagesUrl}}assets/static/img/Group739@2x.png);">
<view class="countDown b">
<!-- 时钟 -->
<countdown is-day="true" tip-text="' '" day-text="' '" hour-text="':'" minute-text="':'" second-text="' '"
datatime="{{indexData.end_time2}}"></countdown>
... ... @@ -67,14 +71,15 @@
style='transform:translateX({{-index*10}}rpx)'>
<image src="{{item}}"></image>
</view>
<image class="arrow" src="{{imagesUrl}}assets/static/img/arrow@2x.png"></image>
<image class="arrow" src="{{imagesUrl}}assets/static/img/Group 751@2x.png"></image>
</view>
</view>
</view>
<!-- 获奖名单 -->
<view class="win">
<view class="pic b" style="background-image: url({{imagesUrl}}assets/static/img/Group705@2x.png)"></view>
<view class="swiper b" style="background-image: url({{imagesUrl}}assets/static/img/group104561@2x.png)">
<view class="pic b" style="background-image: url({{imagesUrl}}assets/draw3/Group705@2x.png)"></view>
<view class="swiper b" style="background-image: url({{imagesUrl}}assets/static/img/Group766@2x.png)">
<!-- 获奖明细 -->
<swiper class="list" autoplay="true" vertical="true" interval="1000" duration="1000" display-multiple-items="3"
circular="true" disable-touch="true">
... ... @@ -96,7 +101,7 @@
<view class="d-pic b" style="background-image: url({{imagesUrl}}assets/static/img/Group753@2x.png)"></view>
<view class="rich-text">
<scroll-view scroll-y class="actInfo">
<import src="../../wxParse/wxParse.wxml" />
<template is="wxParse" data="{{wxParseData:content.nodes}}" />
</scroll-view>
</view>
... ... @@ -106,7 +111,8 @@
bindtap="bindPrize" wx:if="{{false}}">
</view>
<!-- 销售顾问 -->
<view class="adviser b" style="background-image: url({{imagesUrl}}assets/static/img/Group739@2x.png)" wx:if="{{false}}">
<view class="adviser b" style="background-image: url({{imagesUrl}}assets/static/img/Group739@2x.png)"
wx:if="{{false}}">
<!-- 头像 -->
<view class="ad-pic b" style="background-image: url({{imagesUrl}}assets/static/img/Rectangle2610@2x.png)"></view>
<!-- 信息 -->
... ... @@ -127,12 +133,9 @@
</view>
</view>
<!-- 推荐品牌 -->
<view class="recom">
<!-- 品牌标题 -->
<!-- <view class="recom">
<view class="d-pic b" style="background-image: url({{imagesUrl}}assets/static/img/Group753@2x.png)"></view>
<!-- 滚动内容 -->
<view class="adviser b" style="background-image: url({{imagesUrl}}assets/static/img/Group739@2x.png)">
<!-- swiper -->
<swiper class="swiper" circular="true" autoplay="true" next-margin="16rpx">
<block wx:for="{{indexData.pin_img_arr}}" wx:key="index">
<swiper-item class="swiper-item">
... ... @@ -141,7 +144,7 @@
</block>
</swiper>
</view>
</view>
</view> -->
<!-- 浏览量 -->
<view class="views">
... ... @@ -155,7 +158,7 @@
<text class="mark-vt">Copyright</text>
<text class="mark-t">400-0513-066</text>
</view>
<text class="mark-t">小象汽车互联网4S店开放平台</text>
<text class="mark-t">同放汽车互联网4S店开放平台</text>
</view>
</view>
... ... @@ -197,7 +200,9 @@
</view>
<!-- 抵用券中奖弹框区域 -->
<index-draw-alert bind:from_draw_alert="f_d_a" wx:if="{{showCouponDraw}}" getchouName="{{chou.name}}" getchouLogid="{{chou.log_id}}" drawid="{{id}}"></index-draw-alert>
<index-draw-alert bind:from_draw_alert="f_d_a" wx:if="{{showCouponDraw}}" getchouName="{{chou.name}}"
getchouLogid="{{chou.log_id}}" drawid="{{id}}"></index-draw-alert>
<!-- 领取信息弹框区域 -->
<get-prize wx:if="{{showPickInfo}}" bind:from_prize="p_z" brand="{{brand}}" brandId="{{brandId}}" brand2="{{brand2}}" brandId2="{{brandId2}}" drawid="{{id}}"></get-prize>
<get-prize wx:if="{{showPickInfo}}" bind:from_prize="p_z" brand="{{brand}}" brandId="{{brandId}}" brand2="{{brand2}}"
brandId2="{{brandId2}}" drawid="{{id}}"></get-prize>
</view>
\ No newline at end of file
... ...
.box {
width: 100%;
height: 100%;
background: #190f65;
background: rgba(241, 243, 247, 1);
/* 活动人员弹框区域 */
/* 活动规则弹框区域 */
}
.box .banner,.b-swiper,.b-swiper-item,.b-swiper-item-img {
.box .banner,
.b-swiper,
.b-swiper-item,
.b-swiper-item-img {
width: 100%;
height: 400rpx;
}
... ... @@ -16,6 +20,7 @@
padding: 0 50rpx;
box-sizing: border-box;
}
.box .inner .video {
width: 100%;
height: 360rpx;
... ... @@ -26,6 +31,7 @@
margin: 40rpx 0;
position: relative;
}
.box .inner .video .preview {
width: 100%;
height: 100%;
... ... @@ -33,6 +39,7 @@
box-shadow: 0rpx 8rpx 216rpx 0rpx rgba(255, 182, 122, 0.35);
border: 5rpx solid #8f83a2;
}
.box .inner .video .back {
width: 100%;
height: 100%;
... ... @@ -42,6 +49,7 @@
top: 0;
border-radius: 32rpx;
}
.box .inner .video .video-play {
width: 76rpx;
height: 76rpx;
... ... @@ -51,6 +59,7 @@
transform: translate(-32rpx, -32rpx);
z-index: 2;
}
.box .inner .draw {
width: 100%;
height: 800rpx;
... ... @@ -59,6 +68,7 @@
justify-content: center;
position: relative;
}
.box .inner .draw .rule {
width: 100%;
height: 40rpx;
... ... @@ -67,12 +77,14 @@
position: absolute;
top: 50rpx;
}
.box .inner .draw .rule .rule-in text:nth-of-type(1) {
font-size: 24rpx;
font-weight: 500;
color: #edecf2;
color: #2471E4;
line-height: 40rpx;
}
.box .inner .draw .container-in {
width: 600rpx;
height: 610rpx;
... ... @@ -84,12 +96,14 @@
bottom: 0;
margin: auto;
}
.box .inner .draw .container-in .itemBg {
background: url(https://car.goorcar.com/assets/static/img/Rectangle2622@2x.png) no-repeat;
background-size: 100%;
height: 130rpx;
width: 140rpx;
}
.box .inner .draw .container-in .content-out {
position: absolute;
top: 0;
... ... @@ -99,35 +113,40 @@
border-radius: 15rpx;
background-size: 100%;
}
.box .inner .draw .container-in .content-out .img {
display: flex;
justify-content: center;
padding-top: 8rpx;
}
.box .inner .draw .container-in .content-out .img .award-image {
height: 72rpx;
width: 72rpx;
}
.box .inner .draw .container-in .content-out .drawName {
text-align: center;
font-size: 24rpx;
color: #aa3a0c;
font-weight: 600;
}
.box .inner .draw .container-in .content-out .dyqName {
text-align: center;
font-size: 20rpx;
color: #fff;
color: #2471E4;
line-height: 22rpx;
padding: 3rpx 5rpx 0 5rpx;
}
.box .inner .draw .startDraw {
width: 280rpx;
height: 300rpx;
position: absolute;
top: 50%;
top: 47%;
transform: translateY(-112rpx);
}
.box .inner .countDown {
height: 320rpx;
position: relative;
... ... @@ -136,6 +155,15 @@
display: flex;
flex-direction: column;
justify-content: space-around;
border-radius: 32rpx;
opacity: 1;
background: rgba(255, 255, 255, 1);
box-shadow: 0 8rpx 36rpx 0 rgb(55, 58, 78);
}
.box .inner .pic{
width: 328rpx;
height: 140rpx;
}
.box .inner .countDown .progress {
position: relative;
... ... @@ -144,6 +172,7 @@
border-radius: 16rpx;
box-shadow: 0rpx 0rpx 10rpx 10rpx rgba(171, 171, 208, 0.2) inset, 0rpx 0rpx 5rpx 5rpx rgba(253, 202, 136, 0.3) inset;
}
.box .inner .countDown .progress .progressCom {
height: 24rpx;
position: absolute;
... ... @@ -151,32 +180,42 @@
border-radius: 16rpx;
background: linear-gradient(to right, #6a5bdb, #fff);
}
.box .inner .countDown .attend {
display: flex;
justify-content: space-between;
align-items: flex-end;
}
.box .inner .countDown .attend .listnum {
font-size: 28rpx;
color: #c7bfff;
}
.box .inner .countDown .attend .listnum text:nth-of-type(1) {
font-size: 28rpx;
color: #fea145;
}
.box .inner .countDown .attend .listhed {
display: flex;
align-items: center;
}
.box .inner .countDown .attend .listhed .listhed_in image:nth-of-type(1) {
width: 50rpx;
height: 50rpx;
border-radius: 50%;
}
.box .inner .countDown .attend .listhed .arrow {
width: 25rpx;
height: 32rpx;
width: 50rpx;
height: 50rpx;
position: absolute;
right: 13px;
}
.box .inner .win {
width: 100%;
height: 500rpx;
... ... @@ -185,22 +224,27 @@
align-items: center;
justify-content: center;
}
.box .inner .win .pic {
width: 328rpx;
height: 40rpx;
height: 140rpx;
}
.box .inner .win .swiper {
width: 100%;
width: 90%;
height: 340rpx;
padding: 0 50rpx;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
}
.box .inner .win .swiper .list {
width: 100%;
width: 101%;
height: 250rpx;
}
.box .inner .win .swiper .list .list-in {
height: 80rpx;
line-height: 80rpx;
... ... @@ -209,16 +253,20 @@
justify-content: space-around;
border-bottom: 2rpx dashed gainsboro;
}
.box .inner .win .swiper .list .list-in .l {
margin-left: 20rpx;
}
.box .inner .win .swiper .list .list-in .l_i_i {
margin-left: 50rpx;
}
.box .inner .win .swiper .list .list-in .l_i_i text:nth-of-type(2) {
color: #F99E46;
font-size: 28rpx;
}
.box .inner .detail {
width: 100%;
height: auto;
... ... @@ -227,10 +275,12 @@
align-items: center;
justify-content: center;
}
.box .inner .detail .d-pic {
width: 340rpx;
height: 40px;
height: 140rpx;
}
.box .inner .detail .actInfo {
width: 100%;
/* height: 1180rpx; */
... ... @@ -238,11 +288,13 @@
line-height: 44rpx;
font-size: 28rpx;
}
.box .inner .consult {
width: 100%;
height: 160rpx;
margin-top: 50rpx;
}
.box .inner .adviser {
width: 100%;
height: 325rpx;
... ... @@ -252,10 +304,12 @@
box-sizing: border-box;
justify-content: space-between;
}
.box .inner .adviser .ad-pic {
width: 180rpx;
height: 180rpx;
}
.box .inner .adviser .ad-det {
width: 65%;
height: 180rpx;
... ... @@ -263,10 +317,12 @@
flex-direction: column;
justify-content: space-around;
}
.box .inner .adviser .ad-det .ad_det_t {
display: flex;
align-items: baseline;
}
.box .inner .adviser .ad-det .ad_det_t text:nth-of-type(1) {
font-size: 40rpx;
font-weight: 500;
... ... @@ -274,19 +330,23 @@
display: block;
margin-right: 10rpx;
}
.box .inner .adviser .ad-det .ad_det_c {
display: flex;
align-items: center;
}
.box .inner .adviser .ad-det .ad_det_b {
display: flex;
align-items: center;
}
.box .inner .adviser .ad-det .ad_det_b view:nth-of-type(1) {
width: 114rpx;
height: 44rpx;
margin-left: 30rpx;
}
.box .inner .recom {
display: flex;
flex-direction: column;
... ... @@ -295,22 +355,27 @@
height: 460rpx;
justify-content: center;
}
.box .inner .recom .d-pic {
width: 340rpx;
height: 25px;
}
.box .inner .recom .swiper {
width: 100%;
height: 100%;
}
.box .inner .recom .swiper .swiper-item {
display: flex;
align-items: center;
}
.box .inner .recom .swiper .swiper-item image:nth-of-type(1) {
width: 100%;
height: 80%;
}
.box .inner .views {
width: 100%;
height: 136rpx;
... ... @@ -318,11 +383,13 @@
display: flex;
justify-content: space-around;
}
.box .inner .views .txt {
font-size: 24rpx;
font-weight: 400;
color: #ffffff;
color: rgba(33, 66, 115, 1);
}
.box .inner .mark {
width: 100%;
height: 140rpx;
... ... @@ -331,24 +398,29 @@
align-items: center;
justify-content: space-around;
margin-bottom: 50rpx;
color:#7C8DA6;
}
.box .inner .mark .mark-v {
display: flex;
justify-content: space-around;
width: 90%;
}
.box .inner .mark .mark-v text:nth-of-type(1) {
font-size: 22rpx;
font-weight: 400;
color: #ffffff;
color: #7C8DA6;
}
.box .returnTop {
width: 100%;
height: 80rpx;
line-height: 80rpx;
text-align: center;
background: #0a0052;
background: #182840;
}
.box .actPeopleWrap {
position: fixed;
top: 0;
... ... @@ -359,12 +431,14 @@
z-index: 3;
padding: 162rpx 74rpx 0 74rpx;
}
.box .actPeopleWrap .actPeople {
height: 844rpx;
background: #6b6aa8;
border: 8rpx solid #322d74;
border-radius: 16rpx;
}
.box .actPeopleWrap .actPeople .actTitle {
font-size: 32rpx;
color: #fff;
... ... @@ -373,31 +447,37 @@
text-align: center;
font-weight: 600;
}
.box .actPeopleWrap .actPeople .actPeopleScroll {
height: 670rpx;
}
.box .actPeopleWrap .actPeople .actPeopleScroll .actPeopleList {
display: flex;
flex-wrap: wrap;
padding: 0 10rpx;
}
.box .actPeopleWrap .actPeople .actPeopleScroll .actPeopleList .actItemWrap {
width: 20%;
height: 112rpx;
display: flex;
justify-content: center;
}
.box .actPeopleWrap .actPeople .actPeopleScroll .actPeopleList .actItemWrap .actPeopleItem {
width: 88rpx;
height: 88rpx;
background: rgba(0, 0, 0, 0);
border-radius: 50%;
}
.box .actPeopleWrap .actPeople .actPeopleScroll .actPeopleList .actItemWrap .actPeopleItem image:nth-of-type(1) {
width: 88rpx;
height: 88rpx;
border-radius: 50%;
}
.box .actPeopleWrap .closeBtn {
position: fixed;
width: 100%;
... ... @@ -407,10 +487,12 @@
display: flex;
justify-content: center;
}
.box .actPeopleWrap .closeBtn image:nth-of-type(1) {
width: 48rpx;
height: 48rpx;
}
.box .actRuleAlert {
position: fixed;
top: 0;
... ... @@ -423,29 +505,33 @@
justify-content: center;
align-items: center;
}
.box .actRuleAlert .actRule {
width: 70%;
width: 80%;
height: 60%;
background: #7676b2;
border: 8rpx solid #383481;
border-radius: 40rpx;
padding: 0 34rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-around;
background: linear-gradient(180.00deg, #eaeff5 0%, #fff 100%);
}
.box .actRuleAlert .actRule .title {
height: 122rpx;
text-align: center;
line-height: 122rpx;
font-size: 32rpx;
font-weight: 600;
color: #fff;
color: #29313D;
}
.box .actRuleAlert .actRule .content {
height: 474rpx;
color: #fff;
color: #40444A;
}
.box .actRuleAlert .actRule .bottomBtn {
width: 424rpx;
height: 68rpx;
... ... @@ -458,21 +544,25 @@
font-weight: 600;
margin-top: 22rpx;
}
.box .b {
background-size: contain;
background-repeat: no-repeat;
}
.box .t {
font-size: 28rpx;
font-weight: 400;
color: #ffffff;
color: #2471E4;
}
.box .mark-t {
font-size: 22rpx;
font-weight: 400;
color: #c7bfff;
}
.box .litpic {
width: 30rpx;
height: 30rpx;
}
}
\ No newline at end of file
... ...
// package/pages/getwl/getwl.js
import {
request
} from "../../../request/index.js"
Page({
/**
* 页面的初始数据
*/
data: {
wl: '',
wllist: '',
steps: [{
text: '步骤一',
desc: '描述信息',
inactiveIcon: 'location-o',
activeIcon: 'success',
},
{
text: '步骤二',
desc: '描述信息',
inactiveIcon: 'like-o',
activeIcon: 'plus',
},
{
text: '步骤三',
desc: '描述信息',
inactiveIcon: 'star-o',
activeIcon: 'cross',
},
{
text: '步骤四',
desc: '描述信息',
inactiveIcon: 'phone-o',
activeIcon: 'fail',
},
],
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({
wl: JSON.parse(options.param)
})
this.getwl()
},
async getwl() {
console.log('123')
let that = this
let param = that.data.wl
try {
const {
data
} = await request({
url: 'api/Wuliu/wlgj',
method: 'POST',
// data: {
// com:w.com,
// num:w.num,
// phone:w.phone,
// from:w.from,
// to:w.to
// }
data: param
})
let res = data.data.data
let newres = res.map(v => {
return {
text: v.context,
desc: v.time
}
})
console.log(newres)
that.setData({
wllist: newres
})
} catch (err) {
}
}
})
\ No newline at end of file
... ...
{
"usingComponents": {
"van-steps": "@vant/weapp/steps/index"
},
"navigationBarTitleText": "查询物流"
}
\ No newline at end of file
... ...
<view class="box">
<view class="back">
<van-steps steps="{{ wllist }}" active="{{ active }} " direction="vertical" active-color="#E8370F"/>
</view>
</view>
\ No newline at end of file
... ...
.back{
background-repeat:no-repeat;
background-size: 100% 100%;
width: 100%;
height:500rpx;
}
\ No newline at end of file
... ...
// package2/pages/getwl/getwl.js
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
... ...
{
"usingComponents": {}
}
\ No newline at end of file
... ...
<!--package2/pages/getwl/getwl.wxml-->
<text>package2/pages/getwl/getwl.wxml</text>
... ...
/* package2/pages/getwl/getwl.wxss */
\ No newline at end of file
... ...
... ... @@ -59,7 +59,7 @@
</view>
<!-- 小象积分 -->
<view class=" integrate public " wx:if="{{no==''}}">
<text class="integrate_che public_1">小象积分({{orderContent.ping_fen}})</text>
<text class="integrate_che public_1">同放积分({{orderContent.ping_fen}})</text>
<view class="red_imgs">
<text class="integrate_right public_2">{{orderContent.ping_money}}</text>
<view class="changeIMg" catchtap="changeChe">
... ... @@ -121,11 +121,11 @@
</view>
<!-- 说明 explain -->
<view class="explain" wx:if="{{no==''}}">
<text class="explain_ ">使用小象积分抵扣不享受积分赠送</text>
<text class="explain_ ">使用同放积分抵扣不享受积分赠送</text>
<view class="r_explain">
<text class="explain__right ">领取</text>
<text class="explain__red ">{{orderContent.fen}}</text>
<text class="explain__right ">小象积分</text>
<text class="explain__right ">同放积分</text>
</view>
</view>
</view>
... ...
... ... @@ -2,7 +2,7 @@
<view class="header">
<view class="s" style='height:{{statusTop}}px'></view>
<view class="left_img">
<view class="title_oage">小象车孚</view>
<view class="title_oage">同放汽车</view>
</view>
</view>
<view class="health" wx:if="{{S4Spage == true}}">
... ...
... ... @@ -448,6 +448,29 @@ Page({
mask: true
})
},
// 获取物流
getwuliu(e){
let item = e.currentTarget.dataset.item
let param = {
com:item.courier_services,//快递
num:item.kuai_no,//单号
phone:item.address.phone,//电话
from:item.from_addr,//发货地
to:item.address.address//收货
}
let ceship = {
com:'yunda',//快递
num:432309381433262,//单号
phone:17631219416,//电话
from:'福建漳州公司',//发货地
to:'天津市东丽区'//收货
}
console.log(JSON.stringify(ceship))
wx.navigateTo({
url: '/package/pages/getwl/getwl?param='+JSON.stringify(param),
})
}
})
\ No newline at end of file
... ...
... ... @@ -53,6 +53,9 @@
<button class="btn btn_1" data-order_no="{{item.order_no}}">查看订单</button>
</view>
<view class="btns btnitem btnRight" wx:if="{{item.way2 == 5}}">
<button class="btn btn_1" catchtap="getwuliu" data-order_no="{{item.order_no}}" data-item = "{{item}}">
查看物流
</button>
<button class="btn btn_1" catchtap="sureShouOrder" data-order_no="{{item.order_no}}">
确认收货
</button>
... ...
... ... @@ -10,6 +10,33 @@ Page({
four: 4,
msg: '',
it_cloose: false,
showMycar:false,
myCarList:'',
isMycar:'',
isMyplate:'',
isMyFnum:'',
isMyenum:'',
showCarType:false,
typeid:'',
myCarType:'',
Type:[
{
name:'小型车',
id:'02'
},
{
name:'大型车',
id:'01'
},
{
name:'新能源小型车',
id:'52'
},
{
name:'新能源大型车',
id:'51'
},
]
},
onLoad: function (options) {
let that = this
... ... @@ -17,6 +44,7 @@ Page({
that.setData({
// order_id: options.order_id,
})
that.myCar()
},
onShow: function () {},
goback() {
... ... @@ -27,7 +55,7 @@ Page({
url: '/pages/home/home'
})
},
async public() {
async myCar() {
let that = this
try {
const {
... ... @@ -35,26 +63,69 @@ Page({
data
}
} = await request({
url: '',
data: {
goods_id: that.data.goods_id
}
url: '/api/Traffic/getMyCarList',
method:'POST'
})
// console.log(data);
that.setData({
public: data
myCarList:data
})
} catch (err) {
// console.log(err);
that.setData({
msg: err.msg
})
that.popTest()
console.log(err);
}
},
popTest() {
showCar(){
this.setData({
showMycar:true
})
},
closeCar(){
this.setData({
showMycar:false
})
},
// 选中我的车辆
chooseMycar(e){
console.log(e.currentTarget.dataset.idx,'选中的车辆')
let idx = e.currentTarget.dataset.idx
this.setData({
isMycar:this.data.myCarList[idx].name,
isMyplate:this.data.myCarList[idx].pai_name
})
this.closeCar()
},
// 选择车型
showType(){
this.setData({
showCarType:true
})
},
closeType(){
this.setData({
showCarType:false
})
},
chooseType(e){
let idx = e.currentTarget.dataset.idx
this.setData({
myCarType:this.data.Type[idx].name,
typeid:this.data.Type[idx].id
})
this.closeType()
},
getFnum(e){
this.setData({
isMyFnum:e.detail.value
})
},
getenum(e){
this.setData({
isMyenum:e.detail.value
})
},
popTest(msg) {
wx.showToast({
title: this.data.msg,
title: msg,
icon: 'none', //如果要纯文本,不要icon,将值设为'none'
duration: 1300
})
... ... @@ -86,8 +157,36 @@ Page({
},
// 前往查询结果
goRes(){
wx.navigateTo({
url: '/pages/ViolationRes/ViolationRes',
})
let params = {
hphm:this.data.isMyplate,
hpzl:this.data.typeid,
engineno:this.data.isMyenum,
classno:this.data.isMyFnum
}
for(let arr in params){
if(params[arr] == ''){
this.popTest('请填写完整参数')
return false
}
}
this.Search(params)
// wx.navigateTo({
// url: '/pages/ViolationRes/ViolationRes',
// })
},
async Search(p){
try {
const {
data
} = await request({
url: '/api/Traffic/select',
method:'POST',
data:p
})
console.log(data,'查询结果')
} catch (err) {
a.popTest(err.msg)
console.log(err,'报错信息')
}
}
})
\ No newline at end of file
... ...
{
"usingComponents": {},
"usingComponents": {
"van-popup": "@vant/weapp/popup/index"
},
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
... ...
... ... @@ -16,19 +16,23 @@
<image class="vfR" src="../../static/img/weizhang_img@2x.png"></image>
</view>
<view class="vioInner">
<view class="vioCurrency">
小型轿车
<view class="vioCurrency {{isMycar?'sure':''}}" bindtap="showCar">
{{isMycar?isMycar:'选择爱车'}}
<image src="{{imagesUrl}}assets/static/img/right_arrow.png" class="downBtn1" />
</view>
<view class="vioCurrency {{myCarType?'sure':''}}" bindtap="showType">
{{myCarType?myCarType:'选择车辆类型'}}
<image src="{{imagesUrl}}assets/static/img/right_arrow.png" class="downBtn1" />
</view>
<view class="vioCurrency" style="display: flex;align-items:center;justify-content: center;">
<view class="plateL">
<!-- <view class="plateL">
<image src="{{imagesUrl}}assets/static/img/right_arrow.png" class="downBtn2"/>
</view>
<input type="text" class="plateR" placeholder="请输入车牌号" placeholder-class="vioPcs"></input>
</view> -->
<input type="text" class="plateR sure" placeholder="车牌号" placeholder-class="vioPcs" value="{{isMyplate}}"></input>
</view>
<input class="vioCurrency" placeholder="请输入车架号" placeholder-class="vioPcs"></input>
<input class="vioCurrency" placeholder="请输入发动机号" placeholder-class="vioPcs"></input>
<input class="vioCurrency sure" placeholder="请输入车架号" placeholder-class="vioPcs" value="{{isMyFnum}}" bindinput="getFnum"></input>
<input class="vioCurrency sure" placeholder="请输入发动机号" placeholder-class="vioPcs" value="{{isMyenum}}" bindinput="getenum" ></input>
</view>
</view>
<view class="dmc">
... ... @@ -43,7 +47,18 @@
</view>
</view>
</view>
<view class="sureBtn" bindtap="goRes">
<view class="sureBtn" bindtap="goRes" >
查询
</view>
<van-popup show="{{ showMycar }}" bind:close="closeCar" round position="bottom"custom-style="height: 30%">
<view class="myCar">
<view class="carList" wx:for="{{myCarList}}" wx:key="index" bindtap="chooseMycar" data-idx="{{index}}">{{item.name}}</view>
</view>
</van-popup>
<van-popup show="{{ showCarType }}" bind:close="closeType" round position="bottom"custom-style="height: 30%">
<view class="myCar">
<view class="carList" wx:for="{{Type}}" wx:key="index" bindtap="chooseType" data-idx="{{index}}">{{item.name}}</view>
</view>
</van-popup>
</view>
\ No newline at end of file
... ...
... ... @@ -176,3 +176,15 @@ page {
margin: 0 auto;
color: #FFFFFF;
}
.myCar{
width: 100%;
height: 100%;
text-align: center;
padding: 50rpx 0;
}
.carList{
margin-bottom: 20rpx;
}
.sure{
color:black !important;
}
\ No newline at end of file
... ...
... ... @@ -70,12 +70,16 @@ Page({
id: 2
},
],
// 抽奖
showModalStatus2: false,
jump_img:'',
jump_id:'',
},
onLoad: function (options) {
console.log(this.data.address,this.data.address_id,'选中的地址')
let that = this
// console.log(options);
console.log(options);
if (options.gui_arr) {
that.setData({
id: options.id,
... ... @@ -92,9 +96,15 @@ Page({
s4id: options.s4id
})
}
if(options.drawid&&options.drawimg){
that.setData({
jump_id:options.drawid,
jump_img:options.drawimg
})
}
that.getConfirmAnOrder()
// 测试
// that.showDrawModal()
},
onShow: function () {
let that = this
... ... @@ -302,7 +312,7 @@ Page({
data: obj
}).then(res => {
// 改
// console.log(res)
console.log(res,'支付前')
if (res.data.data.type == 0) {
wx.requestPayment({
timeStamp: res.data.data.timeStamp,
... ... @@ -311,13 +321,22 @@ Page({
signType: 'MD5',
paySign: res.data.data.paySign,
success(res) {
// console.log(res);
if(wx.getStorageSync('is_share')){
that.DefaultFollow()
}
wx.redirectTo({
url: '/pages/VtuanOrder/VtuanOrder',
})
console.log(that.data.jump_id,'抽奖id')
if(that.data.jump_id){
console.log('开启抽奖')
that.showDrawModal()
}else{
wx.redirectTo({
url: '/pages/VtuanOrder/VtuanOrder',
})
}
},
fail(res) {
// console.log(res)
... ... @@ -331,12 +350,10 @@ Page({
that.setData({
msg: '支付成功'
})
if(that.data.jump_id&&that.data.jump_img){
that.showDrawModal()
}
that.popSuccessTest()
setTimeout(() => {
wx.redirectTo({
url: '/pages/VtuanOrder/VtuanOrder',
})
}, 1000);
}
}).catch(err => {
... ... @@ -362,10 +379,10 @@ Page({
signType: 'MD5',
paySign: res.data.data.paySign,
success(res) {
if(that.data.jump_id&&that.data.jump_img){
that.showDrawModal()
}
// console.log(res);
wx.redirectTo({
url: '/pages/VtuanOrder/VtuanOrder',
})
},
fail(res) {
console.log(res)
... ... @@ -378,12 +395,10 @@ Page({
that.setData({
msg: '支付成功'
})
if(that.data.jump_id&&that.data.jump_img){
that.showDrawModal()
}
that.popSuccessTest()
setTimeout(() => {
wx.redirectTo({
url: '/pages/VtuanOrder/VtuanOrder',
})
}, 1000);
}
}).catch(err => {
a.popTest(err.msg)
... ... @@ -546,6 +561,57 @@ Page({
duration: 1300
})
},
// 抽奖
showDrawModal() { //显示对话框
var animation = wx.createAnimation({
duration: 200,
timingFunction: "linear",
delay: 0
})
this.animation = animation
animation.translateY(300).step()
this.setData({
animationData: animation.export(),
showModalStatus2: true
})
setTimeout(function () {
animation.translateY(0).step()
this.setData({
animationData: animation.export()
})
}.bind(this), 100)
},
hideDrawModal() { //隐藏对话框
wx.redirectTo({
url: '/pages/VtuanOrder/VtuanOrder',
})
// var animation = wx.createAnimation({
// duration: 200,
// timingFunction: "linear",
// delay: 0
// })
// this.animation = animation
// animation.translateY(300).step()
// this.setData({
// animationData: animation.export(),
// })
// setTimeout(function () {
// animation.translateY(0).step()
// this.setData({
// animationData: animation.export(),
// showModalStatus2: false
// })
// }.bind(this), 100)
},
jumpImgUrl() {
let that = this
wx.navigateTo({
// url: '/pages/webview/webview?url=' + encodeURIComponent(that.data.jump_url)
url: '/package/pages/LuckDraw/LuckDraw?id=' + that.data.jump_id
// url: '/pages/LuckDraw/LuckDraw?id=' + result
})
that.hideModal()
},
popSuccessTest() { // 消息提示
wx.showToast({
title: this.data.msg,
... ... @@ -559,6 +625,7 @@ Page({
wx.requestSubscribeMessage({
tmplIds: ["Q_ecLnQbmEaiyVRYD7air0OVQnlF4daXW5WaXkx201U"],
success: (res) => {
console.log(res,'订阅成功')
if (res['Q_ecLnQbmEaiyVRYD7air0OVQnlF4daXW5WaXkx201U'] === 'accept'){
wx.showToast({
title: '订阅OK!',
... ...
... ... @@ -190,7 +190,13 @@
</van-popup>
<view class="login" wx:if="{{showModalStatus2}}">
<view class="commodity_screen"></view>
<view class="center__nox">
<image src="{{jump_img}}" class="jump_img" mode="widthFix" catchtap="jumpImgUrl" />
<image src="../../static/img/close.png" class="jump_close" catchtap="hideDrawModal" />
</view>
</view>
<view class="b-inner">
<van-action-sheet show="{{ showClerk }}" actions="{{ ClerkList }}" bind:close="onshowClose"
bind:select="onSelect" />
... ...
... ... @@ -525,3 +525,40 @@ van-steps {
height: 100rpx;
line-height: 100rpx;
}
.container .login .commodity_screen {
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
background: #000;
opacity: 0.2;
overflow: hidden;
z-index: 10;
}
.container .login .center__nox {
width: 80%;
position: fixed;
top: 40%;
left: 50%;
transform: translate(-50%, -50%);
z-index: 20;
background: #fff;
padding: 20rpx;
box-sizing: border-box;
border-radius: 24rpx;
}
.container .login .center__nox .jump_img {
width: 100%;
}
.container .login .center__nox .jump_close {
width: 32rpx;
height: 32rpx;
position: absolute;
top: -50rpx;
right: 8rpx;
z-index: 10;
}
\ No newline at end of file
... ...
... ... @@ -34,11 +34,18 @@ Page({
onclick: 1,
is_share: 0,
s4_id: '',
// 新增抽奖
drawid: '',
drawimg: '',
menuTop: '', //导航初始距离顶部
menuFixed: '',
// 分享团购的私人状态
private:0
},
onLoad: function (options) {
let that = this
console.log(options,'分享参数')
console.log(that.data.private, 'options分享传递的参数', '页面首次加载');
if (options.scene) {
that.setData({
id: options.scene,
... ... @@ -55,17 +62,30 @@ Page({
} else {
that.setData({
id: options.id,
tuan_id:options.tuanid,
})
if(options.tuanid){
that.setData({
private:1
})
}
}
}
this.getTuanDetail()
// 分享朋友圈
wx.showShareMenu({
menus: ['shareAppMessage', 'shareTimeline'],
success(res) {
},
fail(e) {
}
success(res) {},
fail(e) {}
})
// 吸顶
var query = wx.createSelectorQuery()
query.select('#affix').boundingClientRect();
query.selectViewport().scrollOffset();
query.exec(function (res) {
that.setData({
menuTop: res[0].top
})
})
},
... ... @@ -76,6 +96,13 @@ Page({
}
this.countTime()
},
onPageScroll: function(e) {
if (this.data.menuFixed === (e.scrollTop > this.data.menuTop)) return;
// 当页面滚动距离scrollTop > menuTop菜单栏距离顶部的距离时,菜单栏固定定位
this.setData({
menuFixed: (e.scrollTop > this.data.menuTop)
})
},
// 分享朋友圈
onShareAppMessage: function (res) {
wx.showShareMenu({
... ... @@ -95,13 +122,16 @@ Page({
}
},
goback() {
if (this.data.is_share == 1) {
wx.reLaunch({
url: '/pages/home/home'
})
} else {
wx.navigateBack()
}
// if (this.data.is_share == 1) {
// wx.reLaunch({
// url: '/pages/home/home'
// })
// } else {
// wx.navigateBack()
// }
wx.reLaunch({
url: '/pages/home/home'
})
},
onChange(e) {
this.setData({
... ... @@ -130,9 +160,20 @@ Page({
tuan_data: data.tuan_data,
s4_id: data.s4_id
})
if (data.activity_id) {
let draw_id = data.jump_url
let draw_pos = draw_id.indexOf('id')
let draw_length = draw_id.length
let result = draw_id.substring(draw_pos + 3, draw_length)
that.setData({
drawid: result,
drawimg: data.jump_img2
})
}
console.log(that.data.drawimg, that.data.drawid, '抽奖数据')
WxParse.wxParse('content', 'html', that.data.content, that, 5);
} catch (err) {
// console.log(err);
console.log(err);
that.setData({
msg: err.msg
})
... ... @@ -196,21 +237,41 @@ Page({
async onclickitem(e) {
let that = this
// console.log(e);
// 修改拼团私有
// if(that.data.private){
// let tuan_id = that.data.tuan_id
// }else{
// }
console.log(that.data.private,that.data.tuan_id,'拼团')
let tuan_id = e.currentTarget.dataset.tuan_id || ''
let shop_id = e.currentTarget.dataset.id
let onclick = e.currentTarget.dataset.onclick
that.setData({
tuan_id,
shop_id,
onclick
})
if(that.data.private == 1){
that.setData({
shop_id,
onclick
})
}else{
that.setData({
tuan_id,
shop_id,
onclick
})
}
console.log(tuan_id,that.data.tuan_id,)
// that.setData({
// tuan_id,
// shop_id,
// onclick
// })
try {
const {
data
} = await request({
url: 'api/shop2/checkPin',
data: {
tuan_id: tuan_id,
tuan_id: that.data.private?that.data.tuan_id:tuan_id,
}
})
// console.log(data);
... ... @@ -335,15 +396,16 @@ Page({
} else {
that.hideModal()
let str = list.join(',')
console.log(that.data.drawid, that.data.drawimg, '传递抽奖数据')
wx.navigateTo({
url: '/pages/VtuanConfirm/VtuanConfirm?id=' + id + '&num=' + num + '&gui_arr=' + str + '&tuan_id=' + that.data.tuan_id + '&s4id=' + that.data.s4_id
url: '/pages/VtuanConfirm/VtuanConfirm?id=' + id + '&num=' + num + '&gui_arr=' + str + '&tuan_id=' + that.data.tuan_id + '&s4id=' + that.data.s4_id + '&drawid=' + that.data.drawid + '&drawimg=' + that.data.drawimg
})
}
} else {
that.hideModal()
wx.navigateTo({
url: '/pages/VtuanConfirm/VtuanConfirm?id=' + id + '&num=' + num + '&tuan_id=' + that.data.tuan_id + '&s4id=' + that.data.s4_id
url: '/pages/VtuanConfirm/VtuanConfirm?id=' + id + '&num=' + num + '&tuan_id=' + that.data.tuan_id + '&s4id=' + that.data.s4_id + '&drawid=' + that.data.drawid + '&drawimg=' + that.data.drawimg
})
}
... ... @@ -476,7 +538,7 @@ Page({
let s4_name = wx.getStorageSync('s4_name')
var shareObj = {
title: that.data.tuanDetail.goods_name, // 默认是小程序的名称(可以写slogan等)
path: '/pages/VtuanDetail/VtuanDetail?id=' + that.data.id + '&is_share=1' + '&s4_id='+ s4_id + '&s4_name=' + s4_name , // 默认是当前页面,必须是以‘/’开头的完整路径
path: '/pages/VtuanDetail/VtuanDetail?id=' + that.data.id + '&is_share=1' + '&s4_id=' + s4_id + '&s4_name=' + s4_name, // 默认是当前页面,必须是以‘/’开头的完整路径
imageUrl: '', //自定义图片路径,可以是本地文件路径、代码包文件路径或者网络图片路径,支持PNG及JPG,不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
};
// 返回shareObj
... ...
<view class="container">
<view class="header">
<view class="s" style='height:{{statusTop}}px'></view>
<view class="left_img">
<image src="{{imagesUrl}}assets/static/img/img_z.png" bindtap="goback" />
<view class="left_img {{menuFixed?'fixed':''}}" id="affix">
<image src="../../static/icon/shouy.png" bindtap="goback" />
<view class="title_oage">团购热卖</view>
</view>
</view>
... ... @@ -36,7 +36,7 @@
</view>
</view>
</view>
<view class="pindannet" wx:if="{{tuan_data.length !=0}}">
<view class="pindannet" wx:if="{{tuan_data.length !=0 && private == 0}}">
<view class="pin_name">
<view class="left_pin" wx:if="{{share==1}}">{{tuan_data.length}}人在拼单,可直接参与</view>
<view class="left_pin" wx:if="{{share==2}}">邀请你进行拼单</view>
... ... @@ -139,7 +139,7 @@
</view>
<view class="buy">
<button class=" bind" bindtap="onclickitem" data-id="{{tuanDetail.goods_id}}" data-onclick="1">
发起拼团({{tuanDetail.tuan_num}}人成团)
{{private==1?'立即参团':'发起拼团'}} ({{tuanDetail.tuan_num}}人成团)
</button>
</view>
</view>
... ...
... ... @@ -277,8 +277,8 @@ page {
height: 88rpx;
}
.container .header .left_img image {
width: 32rpx;
height: 32rpx;
width: 45rpx;
height: 45rpx;
}
.container .header .left_img .title_oage {
flex: 1;
... ... @@ -1061,3 +1061,12 @@ page {
.container .zan_dialog_show .zan_dialog__mask {
display: block;
}
.fixed {
position: fixed;
top: 0;
z-index: 3;
background: #E8370F;
height:176rpx!important;
padding-top:88rpx!important;
}
... ...
... ... @@ -36,7 +36,11 @@ Page({
that.getMyorder()
},
onShow: function () {},
onShow: function () {
let that = this
that.getMyorder()
},
onChange(e) {
this.setData({
timeData: e.detail,
... ... @@ -477,9 +481,11 @@ Page({
let good_id = options.target.dataset.good_id
let good_name = options.target.dataset.good_name
let imgShare = options.target.dataset.imgshare
let tuanid = options.target.dataset.tuanid
console.log(tuanid,'发送tuanid')
let shareObj = {
title: good_name || "小象团购分享", // 默认是小程序的名称(可以写slogan等)
path: '/pages/VtuanDetail/VtuanDetail?id=' + good_id, // 默认是当前页面,必须是以‘/’开头的完整路径
path: '/pages/VtuanDetail/VtuanDetail?id=' + good_id + '&tuanid='+tuanid, // 默认是当前页面,必须是以‘/’开头的完整路径
imageUrl: imgShare, //自定义图片路径,可以是本地文件路径、代码包文件路径或者网络图片路径,支持PNG及JPG,不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
};
// 返回shareObj
... ...
... ... @@ -62,7 +62,7 @@
<!-- <button class="btn btn_3" catchtap="cancelOrder" data-order_no="{{item.order_no}}">
取消订单
</button> -->
<button class="btn btn_2" open-type="share" data-imgshare="{{item.good.img}}" data-good_id="{{item.good.id}}" data-good_name="{{item.good.name}}">
<button class="btn btn_2" open-type="share" data-imgshare="{{item.good.img}}" data-good_id="{{item.good.id}}" data-good_name="{{item.good.name}}" data-tuanid="{{item.tuan_id}}">
立即邀请
</button>
</view>
... ...
... ... @@ -63,10 +63,10 @@ Page({
},
// 返回商品详情
returnGoods(){
returnGoods() {
let id = this.data.ConfirmAnOrder.id
wx.navigateTo({
url: '/pages/VtuanDetail/VtuanDetail?id='+ id,
url: '/pages/VtuanDetail/VtuanDetail?id=' + id,
})
},
cancelOrder(e) { // 取消订单
... ... @@ -169,6 +169,7 @@ Page({
},
async returnMoney(e) { // 申请退款
let that = this
that.Subscribe()
let order_no = e.currentTarget.dataset.order_no
wx.showModal({
title: '提示',
... ... @@ -204,6 +205,31 @@ Page({
})
},
//调起订阅消息 /退款通知
Subscribe() {
return new Promise((resolve, reject) => {
wx.requestSubscribeMessage({
tmplIds: ["dLkIUNEHhOTyzKeh5qWDgecUT8KR11MsC6vZfin8s2o"],
success: (res) => {
if (res['dLkIUNEHhOTyzKeh5qWDgecUT8KR11MsC6vZfin8s2o'] === 'accept') {
wx.showToast({
title: '订阅OK!',
duration: 1000,
success(data) {
//成功
resolve()
}
})
}
},
fail(err) {
//失败
console.error(err);
reject()
}
})
})
},
Immediate(e) { // 立即评价
// console.log(e);
let order_no = e.currentTarget.dataset.order_no
... ...
... ... @@ -69,10 +69,10 @@
<view class="kehu_name">天津北信中乒之星</view>
</view> -->
</view>
<view class="address" wx:else>
<!-- <view class="address" wx:else>
<view class="address_big_title">{{area}}</view>
<view class="shiqu">{{address_detail}}</view>
</view>
</view> -->
<view class="list_count">
<view class="list_title">{{OrderObligation.shop}}</view>
<view class="list" bindtap="returnGoods">
... ... @@ -199,6 +199,9 @@
</button>
</view>
<view class="downbtn" wx:if="{{way == 10}}">
<button class="btn1 btn " catchtap="returnMoney" data-order_no="{{OrderObligation.order_no}}">
申请退款
</button>
<button class="btn btn2" catchtap="abholung" data-order_no="{{OrderObligation.order_no}}">
待自提
</button>
... ...
... ... @@ -25,7 +25,9 @@ Page({
newindex: '',
top_true: true,
scrollH: '', //滚动高度
windowH:'',//屏幕高度
windowH: '', //屏幕高度
//下一步弹框
showNext: false
},
onShow: function () {
... ... @@ -40,9 +42,9 @@ Page({
this.getLeftCates()
wx.getSystemInfo({
success: (result) => {
console.log(result,'屏幕样式')
console.log(result, '屏幕样式')
this.setData({
windowH:result.windowHeight
windowH: result.windowHeight
})
},
})
... ... @@ -130,7 +132,7 @@ Page({
})
},
watchScr(e) {
// console.log(e.detail,'监听滚动')
console.log(e.detail, '监听滚动')
this.setData({
scrollH: e.detail.scrollHeight,
})
... ... @@ -138,42 +140,81 @@ Page({
lower(e) {
let that = this
console.log(that.data.scrollH, that.data.windowH, '对比高度')
// // console.log(e,'向下');
// if (that.data.scrollH > that.data.windowH + 100 ) {
// let leftCates = that.data.leftCates
// let indexnum = Number(that.data.leftCates.length)
// let id = that.data.id
// let send = ''
// // console.log(id,'id');
// // console.log(indexnum,'左侧length')
// leftCates.forEach((item, index) => {
// if (item.id == id) {
// // console.log(index);
// send = index + 1
// }
// })
// // console.log(send);
// if (send != indexnum) {
// let idt = leftCates[send].id
// that.setData({
// id: idt,
// it_tue: false,
// })
// that.getLeftCates()
// } else {
// that.setData({
// id,
// it_tue: true,
// })
// }
// }
that.setData({
showNext: true
})
},
// 前往下一步
goNext() {
let that = this
that.setData({
showNext: false
})
// console.log(e,'向下');
if (that.data.scrollH > that.data.windowH + 100 ) {
let leftCates = that.data.leftCates
let indexnum = Number(that.data.leftCates.length)
let id = that.data.id
let send = ''
// console.log(id,'id');
// console.log(indexnum,'左侧length')
leftCates.forEach((item, index) => {
if (item.id == id) {
// console.log(index);
send = index + 1
}
let leftCates = that.data.leftCates
let indexnum = Number(that.data.leftCates.length)
let id = that.data.id
let send = ''
// console.log(id,'id');
// console.log(indexnum,'左侧length')
leftCates.forEach((item, index) => {
if (item.id == id) {
// console.log(index);
send = index + 1
}
})
// console.log(send);
if (send != indexnum) {
let idt = leftCates[send].id
that.setData({
id: idt,
it_tue: false,
})
that.getLeftCates()
} else {
that.setData({
id,
it_tue: true,
})
// console.log(send);
if (send != indexnum) {
let idt = leftCates[send].id
that.setData({
id: idt,
it_tue: false,
})
that.getLeftCates()
} else {
that.setData({
id,
it_tue: true,
})
}
}
},
upper(e) {
let that = this
// console.log(e, '向上',);
console.log(that.data.scrollH,that.data.windowH+100,'比较')
if (that.data.scrollH > that.data.windowH + 100 ) {
console.log(that.data.scrollH, that.data.windowH + 100, '比较')
if (that.data.scrollH > that.data.windowH + 100) {
let leftCates = that.data.leftCates
let id = that.data.id
let send = ''
... ... @@ -192,6 +233,7 @@ Page({
// console.log(idt);
that.setData({
id: idt,
showNext:false
})
that.getLeftCates()
}
... ...
... ... @@ -28,4 +28,8 @@
<!-- </view> -->
</scroll-view>
</view>
<view class="nextOne" wx:if="{{showNext}}" bindtap="goNext">
<image src="../../static/img/more_img.png"></image>
<text>下一分类</text>
</view>
</view>
\ No newline at end of file
... ...
page {
height: 100%;
}
.container {
width: 100%;
}
.container .category_menu {
display: flex;
margin-right: 20rpx;
padding-bottom: 32rpx;
box-sizing: border-box;
}
.container .category_menu .left_menu {
width: 25%;
height: 100%;
... ... @@ -18,12 +21,14 @@ page {
top: 0;
left: 0;
}
.container .category_menu .left_menu .menu_item {
display: flex;
flex-direction: column;
align-items: center;
width: 100%;
}
.container .category_menu .left_menu .menu_item .fu_item {
width: 100%;
padding: 28rpx 0rpx;
... ... @@ -32,6 +37,7 @@ page {
font-size: 24rpx;
color: #8C9198;
}
.container .category_menu .left_menu .menu_item .active {
position: relative;
font-size: 28rpx;
... ... @@ -39,6 +45,7 @@ page {
font-weight: 600;
background-color: #fff;
}
.container .category_menu .left_menu .menu_item .active::after {
content: '';
position: absolute;
... ... @@ -49,6 +56,7 @@ page {
background-color: #E8370F;
border-radius: 4rpx;
}
.container .category_menu .left_menu .menu_item .menu_item_child {
width: 200rpx;
display: flex;
... ... @@ -56,6 +64,7 @@ page {
align-items: center;
justify-content: center;
}
.container .category_menu .left_menu .menu_item .menu_item_child .child_ {
margin: 10rpx 0;
font-size: 28rpx;
... ... @@ -63,9 +72,11 @@ page {
text-align: center;
border: 1rpx solid #ccc;
}
.container .category_menu .left_menu .menu_item .menu_item_child .menu_item:first-child {
margin-top: 10rpx;
}
.container .category_menu .right_menu {
position: absolute;
top: 0;
... ... @@ -75,10 +86,12 @@ page {
padding: 28rpx 0;
box-sizing: border-box;
}
.container .category_menu .right_menu .goods_group {
width: 100%;
/* 分类 3级*/
}
.container .category_menu .right_menu .goods_group .goods_title {
width: 100%;
margin-top: 30rpx;
... ... @@ -88,24 +101,29 @@ page {
align-items: center;
justify-content: center;
}
.container .category_menu .right_menu .goods_group .goods_title .text_title {
color: #06121E;
font-size: 28rpx;
font-weight: 600;
margin: 0 26rpx;
}
.container .category_menu .right_menu .goods_group .goods_title .color_bg {
width: 50rpx;
height: 2rpx;
background-color: #FD6C83;
}
.container .category_menu .right_menu .goods_group .goods_title:first-child {
margin: 0;
}
.container .category_menu .right_menu .goods_group .category {
margin-top: 30rpx;
width: 100%;
}
.container .category_menu .right_menu .goods_group .category .los_cate {
width: 100%;
display: flex;
... ... @@ -113,6 +131,7 @@ page {
padding-right: 20rpx;
box-sizing: border-box;
}
.container .category_menu .right_menu .goods_group .category .los_cate .category_list {
display: flex;
flex-direction: column;
... ... @@ -120,10 +139,12 @@ page {
justify-content: center;
width: 33.33%;
}
.container .category_menu .right_menu .goods_group .category .los_cate .category_list .imgae {
width: 156rpx;
height: 156rpx;
}
.container .category_menu .right_menu .goods_group .category .los_cate .category_list .view_text {
display: inline-block;
color: #5B5E63;
... ... @@ -131,9 +152,11 @@ page {
padding: 20rpx 0;
box-sizing: border-box;
}
.container .category_menu .right_menu .goods_group .category .los_cate .category_list:nth-child(3n + 3) {
margin-right: 0;
}
.container .category_menu .right_menu .goods_group .category .bts {
width: 100%;
display: flex;
... ... @@ -144,8 +167,35 @@ page {
color: #8C9198;
font-size: 28rpx;
}
.container .category_menu .right_menu .goods_group ::-webkit-scrollbar {
width: 0;
height: 0;
color: transparent;
}
.container .nextOne {
width: 175rpx;
height: 60rpx;
z-index: 10;
position: fixed;
right: 50rpx;
bottom: 70rpx;
display: flex;
align-items: center;
border-radius: 200rpx;
background:#F7F8FA
}
.container .nextOne image {
width: 60rpx;
height: 100%
}
.container .nextOne text {
display: inline-block;
color: #E8370F;
font-size: 24rpx;
padding: 20rpx 0;
box-sizing: border-box;
}
\ No newline at end of file
... ...
... ... @@ -27,7 +27,7 @@
<view class="car_ziliao">
<view class="con_count" bindtap="goIntegration" data-typed="1">
<view class="text_con">{{ping_fen}}</view>
<view class="text_name">小象积分</view>
<view class="text_name">同放积分</view>
</view>
<view class="con_count" bindtap="goIntegration" data-typed="2">
<view class="text_con">{{s4_fen}}</view>
... ... @@ -45,7 +45,7 @@
<view class="cate">
<view class="scroll_1 catePublic">
<image src="{{imagesUrl}}assets/static/img/4_icon@2x.png" class="publicImg" bindtap="toMyOrder" />
<view class="cate_1 cate_public">小象订单</view>
<view class="cate_1 cate_public">同放订单</view>
</view>
<view class="scroll_2 catePublic">
<image src="{{imagesUrl}}assets/static/img/d_i.png" class="publicImg" bindtap="toMyservice" />
... ... @@ -148,7 +148,7 @@
<view class="left_public ">
<button open-type="contact" class="transparent"></button>
<image src="{{imagesUrl}}assets/static/img/8_icon@2x(4).png" />
<text class="public_name">小象客服</text>
<text class="public_name">同放客服</text>
</view>
<view class="right_PublicImg">
<image src="{{imagesUrl}}assets/static/img/arrow-you.png" />
... ...
... ... @@ -37,6 +37,8 @@ Page({
s4_id: '',
s4_name: '',
statusTop: a.globalData.statusHeight,
menuTop:'',//导航初始距离顶部
menuFixed:''
},
onShow: function () {
console.log('页面再展示')
... ... @@ -52,7 +54,7 @@ Page({
},
onLoad: function (options) {
let that = this
console.log(options, 'options分享传递的参数', '页面首次加载');
let token = wx.getStorageSync('token')
if (options.scene) {
... ... @@ -60,7 +62,7 @@ Page({
id: options.scene,
type: 2,
})
// wx.setStorageSync('s4_id', options.s4_id)
// wx.setStorageSync('s4_name', options.s4_name)
} else {
... ... @@ -74,7 +76,7 @@ Page({
if (options.s4_name) {
wx.setStorageSync('s4_name', options.s4_name)
}
if(options.is_share){
if (options.is_share) {
wx.setStorageSync('is_share', options.is_share)
}
// 改
... ... @@ -92,6 +94,7 @@ Page({
// id: options.id,
// })
// }
}
if (!token) {
wx.showModal({
... ... @@ -116,15 +119,35 @@ Page({
that.gethuodong()
}
// 吸顶
var query = wx.createSelectorQuery()
query.select('#affix').boundingClientRect();
query.selectViewport().scrollOffset();
query.exec(function (res) {
that.setData({
menuTop: res[0].top
})
})
},
onPageScroll: function(e) {
if (this.data.menuFixed === (e.scrollTop > this.data.menuTop)) return;
// 当页面滚动距离scrollTop > menuTop菜单栏距离顶部的距离时,菜单栏固定定位
this.setData({
menuFixed: (e.scrollTop > this.data.menuTop)
})
},
goback() {
if (wx.getStorageSync('is_share') == 1) {
wx.reLaunch({
url: '/pages/home/home'
})
} else {
wx.navigateBack()
}
// if (wx.getStorageSync('is_share') == 1) {
// wx.reLaunch({
// url: '/pages/home/home'
// })
// } else {
// wx.navigateBack()
// }
wx.reLaunch({
url: '/pages/home/home'
})
},
// 分享朋友圈
onShareAppMessage: function (res) {
... ...
<view class="container">
<view class="header">
<view class="s" style='height:{{statusTop}}px'></view>
<view class="left_img">
<image src="{{imagesUrl}}assets/static/img/img_z.png" bindtap="goback" />
<view class="left_img {{menuFixed?'fixed':''}}" id="affix">
<image src="../../static/icon/shouy.png" bindtap="goback" />
<view class="title_oage">活动详情</view>
</view>
</view>
... ...
... ... @@ -14,8 +14,8 @@
height: 88rpx;
}
.container .header .left_img image {
width: 32rpx;
height: 32rpx;
width: 45rpx;
height: 45rpx;
}
.container .header .left_img .title_oage {
flex: 1;
... ... @@ -489,3 +489,12 @@
margin-bottom: 20rpx;
background-color: #ccc;
}
.fixed {
position: fixed;
top: 0;
z-index: 3;
background: #E8370F;
height:176rpx!important;
padding-top:88rpx!important;
}
... ...
... ... @@ -22,7 +22,7 @@ Page({
jump_img: '',
jump_url: '',
jump_id: '',
// obj: '',
obj: '',
// 展示弹出
bind4sClerk: '',
showClerk: false,
... ... @@ -77,21 +77,12 @@ Page({
let that = this
let s4id = that.data.s4id
// 测试
// this.showModal()
// if (s4id == 0) {
// } else {
// that.setData({
// bindClerk: true
// })
// }
that.setData({
bind4sClerk: true
})
},
// 点击选选择经销商
show4s() {
let that = this
wx.navigateTo({
url: '/pages/Vmore4SList/Vmore4SList',
})
... ... @@ -403,7 +394,8 @@ Page({
console.log(result, '截取结果')
wx.navigateTo({
// url: '/pages/webview/webview?url=' + encodeURIComponent(that.data.jump_url)
url: '/pages/LuckDraw/LuckDraw?id=' + result +'&userMsg=' + JSON.stringify(that.data.obj)
url: '/package/pages/LuckDraw/LuckDraw?id=' + result +'&userMsg=' + JSON.stringify(that.data.obj)
// url: '/pages/LuckDraw/LuckDraw?id=' + result
})
that.hideModal()
},
... ...
... ... @@ -29,7 +29,7 @@
</view>
<view class="integratea" wx:if="{{detaillist.active.price != 0}}">
<view class=" integrate ">
<text class="integrate_che ">小象积分({{detaillist.ping_fen}})</text>
<text class="integrate_che ">同放积分({{detaillist.ping_fen}})</text>
<view class="red_imgs" catchtap="changeChe" data-id="{{detaillist.id}}">
<text class="integrate_right ">{{detaillist.ping_money}}</text>
<view class="changeIMg">
... ... @@ -39,7 +39,7 @@
</view>
</view>
<view class="explain">
<view class="explain_ ">使用小象积分抵扣不享受积分赠送</view>
<view class="explain_ ">使用同放积分抵扣不享受积分赠送</view>
<view class="r_explain">
<!-- <text class="explain__right ">领取</text>
<text class="explain__red ">0</text>
... ... @@ -126,7 +126,7 @@
<button class="btn" bindtap="send4sClerk">下一步</button>
</block>
<!-- <button class="btn" bindtap="send4sClerk" formType="submit">下一步</button> -->
<text class="remarks">小象汽车互联网4s店将为您全程服务</text>
<text class="remarks">同放汽车互联网4s店将为您全程服务</text>
</view>
... ...
... ... @@ -174,7 +174,7 @@ Page({
})
that.popSuccessTest()
setTimeout(() => {
that.navigateTo({
wx.navigateTo({
url: '/pages/MyOrder/MyOrder'
})
}, 2000);
... ... @@ -221,7 +221,7 @@ Page({
})
that.popSuccessTest()
setTimeout(() => {
that.navigateTo({
wx.navigateTo({
url: '/pages/MyOrder/MyOrder'
})
}, 2000);
... ...
... ... @@ -46,7 +46,7 @@
<view class="collar">
至少领
<text class="count_num">{{detailsContent.fen}}</text>
小象积分
同放积分
</view>
<text class="all_clear collar">运费:{{detailsContent.yun_str}}</text>
</view>
... ... @@ -96,7 +96,7 @@
</view>
<view class="icon_title">保障</view>
</view>
<view class="pub pubone">{{s4_id == 0?'小象直营' : '直营'}}</view>
<view class="pub pubone">{{s4_id == 0?'同放直营' : '直营'}}</view>
<view class="pub">商品优选</view>
<view class="pub">破损包退</view>
<view class="pub">极速赔付</view>
... ...
... ... @@ -2,12 +2,12 @@
<view class="header">
<view class="s" style='height:{{statusTop}}px'></view>
<view class="left_img">
<view class="title_oage">小象车孚</view>
<view class="title_oage">同放汽车</view>
</view>
</view>
<view class="cateCart">
<view class="left_store {{_num == 1? 'item__changed':''}}" data-num="1" bindtap="changeTitle">
<view class="left_totd ">小象商品</view>
<view class="left_totd ">同放商品</view>
</view>
<view class="right_store {{_num == 2? 'item__changed':''}}" data-num="2" bindtap="changeTitle">
<view class="right_totd ">4S店商品</view>
... ...
... ... @@ -2,7 +2,7 @@
<view class="header">
<view class="s" style='height:{{statusTop}}px'></view>
<view class="left_img">
<view class="title_oage">小象车孚</view>
<view class="title_oage">同放汽车</view>
</view>
</view>
<view class="health_home">
... ...
... ... @@ -3,6 +3,8 @@ export const request = (params) => {
wx.showNavigationBarLoading()
// const baseUrl = "http://chemai.t.brotop.cn/"
const baseUrl = "https://car.goorcar.com/"
// const baseUrl = "http://test.xiaoxiangauto.com/"
return new Promise((resolve, reject) => {
let header = {
'token': wx.getStorageSync("token") || ''
... ...

390 字节 | 宽: | 高:

372 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

560 字节 | 宽: | 高:

551 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

586 字节 | 宽: | 高:

544 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

580 字节 | 宽: | 高:

505 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

442 字节 | 宽: | 高:

423 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

468 字节 | 宽: | 高:

457 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

630 字节 | 宽: | 高:

566 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

494 字节 | 宽: | 高:

428 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖
不能预览此文件类型

940 字节 | 宽: | 高:

848 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

945 字节 | 宽: | 高:

837 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

906 字节 | 宽: | 高:

843 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

33.3 KB | 宽: | 高:

7.9 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖