xt / xcx-book · Commits

Go to a project

Commit 17899621a2e84478000029fbbe1dec5be212bd5d

Authored by vking
2 parents 200c9e85 c34861a2
build: skipped

Merge branch 'master-activity-pay-sellerdo'

Inline Side-by-side
Showing 100 changed files with 3003 additions and 152 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 100+ files are displayed.

... ... @@ -23,6 +23,13 @@ App({
shareTicket:"",
isAdmin:false,//是否运营人员
onLaunch: async function (opt) {
if(wx.getLogManager){
const logger =wx.getLogManager()
console.log.prototype=function(){
console.log(...arguments)
logger.debug(...arguments)
};
}
console.log('onLaunch',opt,wx.env);
wx.removeStorage({key: 'formids'});//清理历史formids
mta.App.init({
... ...
... ... @@ -38,6 +38,27 @@
],
"subpackages": [
{
"root": "pack-checkout",
"name": "支付",
"pages": [
"pages/index"
]
},
{
"root": "pack-activity",
"name": "红包活动包",
"pages": [
"pages/index",
"pages/money",
"pages/kefu",
"pages/qiye",
"pages/rule",
"pages/yuding",
"pack/pack",
"pack/list"
]
},
{
"root": "pack-cookbook",
"name": "提前点餐包",
"pages": [
... ... @@ -70,7 +91,9 @@
"pages/book/smsbatch/list",
"pages/book/smsbatch/result",
"pages/book/roomtype/roomtype",
"pages/book/b_reserve"
"pages/book/b_reserve",
"pages/checkout/index",
"pages/checkout/invoice"
]
}
],
... ... @@ -133,6 +156,10 @@
"haowu": {
"version": "3.2.0",
"provider": "wx56c8f077de74b07c"
},
"vktool": {
"version": "2.1.9",
"provider": "wxd3dc4206c76f14fc"
}
},
"navigateToMiniProgramAppIdList": [
... ... @@ -144,8 +171,7 @@
}
},
"usingComponents": {
"layout": "/components/layout",
"fb": "/components/common/feedback"
"layout": "/components/layout"
},
"debug": true,
"sitemapLocation": "sitemap.json"
... ...
... ... @@ -225,7 +225,8 @@ image{
}
.Medium{
font-weight: 400;
font-family:PingFangSC-Medium,PingFang SC;
font-weight: 500;
}
.button-none {
display: inline-block;
... ... @@ -252,7 +253,7 @@ image{
.more{
width: 12rpx;
height: 22rpx;
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/click.png");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/click.png");
background-size: 100% 100%;
min-width: 12rpx;
background-repeat: no-repeat;
... ...
// components/activity/enter.js
import util from '../../utils/util';
import App from '../../utils/api';
Component({
/**
* 组件的属性列表
*/
properties: {
hasInHome:Boolean,
floclass:String,
},
/**
* 组件的初始数据
*/
data: {
activity:null,
displayType:0,//0|1 浮层|弹框
},
/**
* 组件的方法列表
*/
methods: {
close(){
this.setData({
displayType:0,
})
},
hasActivity(e){//有通知就可以参加活动
console.log('hasActivity.enter',e)
this.getActivity()
},
getActivity(){
//hasInHome 金额少于1000 只显示小图
App.Task.GetTaskInfo({pos:'home'}).then(res=>{
let time=new Date()/1000
let activity=res.data.activity
if(!activity) return;
activity.task=res.data.task
let displayType=0//浮层
if(activity.status==1 && activity.starttime<time && time<activity.endtime){
if(activity.balance>1000){
if(activity.task.status!=2){
displayType=1//弹框
App.Task.SetTaskInfo({//领取任务
aid:activity.id,
tid:activity.task.id,
})
}
}else{
if(!this.data.hasInHome){//非首页浮层也不显示
activity=null
}
}
this.setData({
displayType:displayType,
activity:activity
})
}
})
},
}
})
... ...
{
"component": true,
"usingComponents": {
"has":"./hasActivity"
}
}
\ No newline at end of file
... ...
<!--components/activity/enter.wxml-->
<has bindevent="hasActivity"></has>
<block wx:if="{{activity}}">
<view class="mask" wx:if="{{displayType==1}}">
<view class="close" bindtap="close"></view>
<view class="activity" bindcatch="bindcatch">
<view class="enter">
<view class="enter-txt">请客订包间，就用周到安排</view>
<view class="enter-hot flex-cc">
<view class="enter-icon lt"></view>
<view class="enter-hot-txt">开工专享红包</view>
<view class="enter-icon gt"></view>
</view>
</view>
<view class="money">
<view class="money-tip flex-cc">订包间，消费抵现金</view>
<view class="money-views flex-bc">
<view class="money-number">{{activity.task.price}}</view>
<view class="money-dw">元</view>
</view>
<navigator url="/pack-activity/pages/index?id={{activity.id}}"
bindtap="close"
hover-class="navigator-hover">
<view class="money-button flex-cc">开心收下</view>
</navigator>
</view>
</view>
</view>
<navigator wx:else="" hover-class="navigator-hover"
url="/pack-activity/pages/index?id={{activity.id}}" >
<view class="mask-tips {{floclass}}" style="background-image: url({{activity.task.flo_url}})"></view>
</navigator>
</block>
... ...
/* components/activity/enter.wxss */
@import "../../app.wxss";
.mask{
z-index: 99999;
}
.close{
width: 60rpx;
height: 60rpx;
background-image: url("http://nosqn.colorcun.com/activity/images/enter/close.png");
background-size: 100% 100%;
margin-top: 200rpx;
margin-left: calc(100% - 100rpx);
}
.activity{
position: relative;
margin-top: 20rpx;
}
.enter{
width: 564rpx;
height: 471.3rpx;
background-image: url("http://nosqn.colorcun.com/activity/images/enter/enter.png");
background-size: 100% 100%;
margin-left:calc(50% - 282rpx);
box-sizing: border-box;
padding-top: 146rpx;
}
.enter-txt{
height:34rpx;
font-size:24rpx;
font-weight:500;
color:rgba(255,227,192,1);
line-height:34rpx;
letter-spacing:1rpx;
text-align: center;
}
.enter-hot{
height:50rpx;
font-size:36rpx;
font-weight:600;
color:rgba(255,227,192,1);
line-height:50rpx;
letter-spacing:2rpx;
margin-top: 46rpx;
}
.enter-hot-txt{
width:236rpx;
overflow: hidden;
white-space: nowrap;
margin: 0 20rpx 0;
text-align: center;
}
.enter-icon{
background-size: 100% 100%;
width:70rpx;
height:16rpx;
}
.enter-icon.lt{
background-image: url("http://nosqn.colorcun.com/activity/images/enter/lt-1.png");
}
.enter-icon.gt{
background-image: url("http://nosqn.colorcun.com/activity/images/enter/gt-1.png");
}
.money{
width: 400rpx;
height: 360rpx;
background-image: url("http://nosqn.colorcun.com/activity/images/enter/money.png");
background-size: 100% 100%;
margin-left:calc(50% - 200rpx + 13rpx);
margin-top: -143rpx;
box-sizing: border-box;
padding-top: 40rpx;
}
.money-tip{
height:34rpx;
font-size:24rpx;
font-weight:600;
color:rgba(204,17,39,1);
line-height:34rpx;
letter-spacing:1rpx;
}
.money-views{
height:106rpx;
font-size:76rpx;
font-weight:600;
color:rgba(204,17,39,1);
line-height:106rpx;
letter-spacing:1rpx;
margin-top: 16rpx;
}
.money-dw{
width:26rpx;
height:34rpx;
font-size:24rpx;
font-weight:600;
color:rgba(204,17,39,1);
line-height:34rpx;
letter-spacing:1rpx;
margin-left: 10rpx;
}
.money-button{
width:290rpx;
height:70rpx;
background:linear-gradient(180deg,rgba(231,66,88,1) 0%,rgba(243,53,78,1) 100%);
box-shadow:0rpx 2rpx 2rpx 0rpx rgba(209,33,54,1);
border-radius:35rpx;
font-size:32rpx;
font-weight:600;
color:rgba(255,227,192,1);
letter-spacing:1rpx;
text-shadow:0rpx 4rpx 8rpx rgba(207,31,51,1);
position: relative;
margin-top: 60rpx;
margin-left: 54rpx;
}
.money-button:after{
display: block;
position: absolute;
content: "";
width:36rpx;
height:36rpx;
background-size: 100% 100%;
background-image: url("http://nosqn.colorcun.com/activity/images/enter/more.png");
top:16rpx;
right:28rpx;
}
.mask-tips{
width: 110rpx;
height: 140rpx;
position: fixed;
left: 20rpx;
bottom: 520rpx;
/*background-image: url("http://nosqn.colorcun.com/activity/images/fl.png");*/
background-size: 100% 100%;
}
.mask-tips.detail_owner{
width: 120rpx;
height: 160rpx;
bottom: 320rpx;
}
\ No newline at end of file
... ...
// components/activity/hasActivity.js
const TSPOS={
latitude:[
39.8380681800,
39.4711852300,
],
longitude:[
117.9670715300,
118.4078979500,
]
}
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
lifetimes: {
// 生命周期函数，可以为函数，或一个在methods段中定义的方法名
attached: function () {
this.selectComponent('#getpos').getPos();
},
moved: function () { },
detached: function () { },
},
/**
* 组件的方法列表
*/
methods: {
onpos(e){
let location=e.detail
location.latitude=39.6242016100
location.longitude=118.1174469000
//console.log('hasActivity',location);
if(location.latitude && location.longitude){
TSPOS.latitude.push(location.latitude)
TSPOS.longitude.push(location.longitude)
TSPOS.latitude=TSPOS.latitude.sort(($1,$2)=>{ return $1-$2})
TSPOS.longitude=TSPOS.longitude.sort(($1,$2)=>{ return $1-$2})
console.log('hasActivity',TSPOS);
if(TSPOS.latitude[1]==location.latitude
&& TSPOS.longitude[1]==location.longitude){
//console.log('hasActivity.event',location);
this.triggerEvent('event',location)
}
}
},
}
})
... ...
{
"component": true,
"usingComponents": {
"getpos":"/components/userinfo/getpos"
}
}
\ No newline at end of file
... ...
<!--components/activity/hasActivity.wxml-->
<getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos>
... ...
/* components/activity/hasActivity.wxss */
... ...
// components/activity/tips.js
import util from '../../utils/util';
import App from '../../utils/api';
Component({
/**
* 组件的属性列表
*/
properties: {
pos:String,
str:String,
cla:String,
},
/**
* 组件的初始数据
*/
data: {
activity:null,
},
lifetimes: {
// 生命周期函数，可以为函数，或一个在methods段中定义的方法名
attached: function () { },
moved: function () { },
detached: function () { },
},
/**
* 组件的方法列表
*/
methods: {
hasActivity(e){//有通知就可以参加活动
console.log('hasActivity.enter',e)
this.getActivity()
},
getActivity(){
//hasInHome 金额少于1000 只显示小图
App.Task.GetTaskInfo({pos:this.data.pos}).then(res=>{
let time=new Date()/1000
let activity=res.data.activity
activity.task=res.data.task
if(activity.status==1 && activity.starttime<time && time<activity.endtime){
if(activity.balance>1000 && activity.task.status!=2){
//通知页面显示tips
this.setData({
activity:activity,
msg:this.data.str.replace("￥price","￥"+activity.task.price)
})
}
}
})
},
}
})
... ...
{
"component": true,
"usingComponents": {
"has":"./hasActivity"
}
}
\ No newline at end of file
... ...
<!--components/activity/tips.wxml-->
<has bindevent="hasActivity"></has>
<view class="tips {{cla}}" wx:if="{{activity}}">
<view class="msg">
{{msg}}
<view class="jiao"></view>
</view>
</view>
... ...
/* components/activity/tips.wxss */
.tips{
position: fixed;
z-index: 9999;
background:rgba(84,83,84,0.8);
font-size:24rpx;
font-weight:500;
color:rgba(255,255,255,1);
}
.tips .msg{
height: 70rpx;
line-height: 70rpx;
padding: 0 24rpx;
position: relative;
}
.jiao{
width: 26rpx;
height: 10rpx;
background-image: url("http://nosqn.colorcun.com/activity/images/jiao2.png");
background-size: 100% 100%;
position: absolute;
bottom: -10rpx;
left:30rpx;
}
.tips.reserve-detail{
bottom:122rpx;
right:30rpx;
}
.tips.reserve-detail .jiao{
right:80rpx;
left:auto;
}
.tips.reserve-detail .msg{
color: #FEDE68;
}
.tips.reserve-detail .msg:before{
content: "现在预订即可获得";
color:rgba(255,255,255,1);
}
.tips.reserve-detail .msg:after{
content: "红包";
color:rgba(255,255,255,1);
}
.tips.detail-invitation{
bottom:112rpx;
left:28rpx;
}
.tips.detail-invitation .msg{
color: #ECD9B7;
font-weight: bold;
}
.tips.detail-invitation .msg:before{
content: "订包间即可获得";
color:rgba(236,217,183,1);
font-weight: normal;
}
.tips.detail-invitation .msg:after{
content: "红包";
color:rgba(236,217,183,1);
font-weight: normal;
}
.tips.detail-invitation .jiao{
left:80rpx;
}
\ No newline at end of file
... ...
<!--components/common/feedback.wxml-->
<cover-view class="button-none feedback" wx:if="{{hasDispaly}}" style="top:{{top}}%">
<button class="button-none" open-type="feedback">反馈</button>
</cover-view>
/* components/common/feedback.wxss */
.feedback{
position: fixed;
right: 20rpx;
box-sizing: border-box;
width: 80rpx;
height: 80rpx;
top:50%;
background-color: rgba(200,0,0,0.2);
z-index: 9999;
padding: 0;
line-height: 80rpx;
border-radius: 50%;
}
.button-none{
box-sizing: border-box;
width: 80rpx;
height: 80rpx;
background-color: rgba(200,0,0,0.2);
color: #fefefe;
font-size: 24rpx;
font-weight: bold;
border-radius: 50%;
line-height: 80rpx;
padding: 0;
}
\ No newline at end of file
... ... @@ -4,7 +4,7 @@
<icon type="success_no_circle" class="icon-success" color="#fff" size="40"></icon>
</block>
<block wx:else>
<image src="http://qn.colorcun.com/custom/lite/image/{{imgurl}}" class="reminder-image"></image>
<image src="http://nosqn.colorcun.com/custom/lite/image/{{imgurl}}" class="reminder-image"></image>
</block>
<view class="white smooth fsize16" style="line-height:1.2;margin-top:{{icon==true ? '-10rpx' : '20rpx'}};padding: 0 10px;text-align: center;">{{action_title}}</view>
<view class="white smooth fsize16" style="line-height:1.2;margin-top:10rpx;">{{action_so}}</view>
... ...
... ... @@ -41,22 +41,22 @@
height: 100%;
}
.tabBar .reserve{
background-image: url("http://qn.colorcun.com/manager-invitation/wx2/%E9%80%9A%E7%9F%A5%E5%AE%A2%E6%88%B7-%E6%9C%AA%E7%82%B9%E5%87%BB.png");
background-image: url("http://nosqn.colorcun.com/manager-invitation/wx2/%E9%80%9A%E7%9F%A5%E5%AE%A2%E6%88%B7-%E6%9C%AA%E7%82%B9%E5%87%BB.png");
}
.tabBar .checked .reserve{
background-image: url("http://qn.colorcun.com/manager-invitation/wx2/%E9%80%9A%E7%9F%A5%E5%AE%A2%E6%88%B7-%E7%82%B9%E5%87%BB.png");
background-image: url("http://nosqn.colorcun.com/manager-invitation/wx2/%E9%80%9A%E7%9F%A5%E5%AE%A2%E6%88%B7-%E7%82%B9%E5%87%BB.png");
}
.tabBar .book{
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/seller-tabs2-book.png");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/seller-tabs2-book.png");
}
.tabBar .checked .book {
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/seller-tabs2-book-checked.png");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/seller-tabs2-book-checked.png");
}
.tabBar .setting{
width: 34rpx;
height: 34rpx;
background-image: url("http://qn.colorcun.com/manager-invitation/wx2/%E6%88%91%E7%9A%84.png");
background-image: url("http://nosqn.colorcun.com/manager-invitation/wx2/%E6%88%91%E7%9A%84.png");
}
.tabBar .checked .setting {
background-image: url("http://qn.colorcun.com/manager-invitation/wx2/%E6%88%91%E7%9A%84-%E9%80%89%E4%B8%AD.png");
background-image: url("http://nosqn.colorcun.com/manager-invitation/wx2/%E6%88%91%E7%9A%84-%E9%80%89%E4%B8%AD.png");
}
... ...
... ... @@ -6,11 +6,11 @@
<view class="opt flex-ll">
<view class="back flex-vc" bindtap="back" wx:if="{{disBack}}">
<image class="back-image"
src="http://qn.colorcun.com/custom/lite-yd/image/back{{backgroundColor!='#ffffff'?'-light':''}}.png"></image>
src="http://nosqn.colorcun.com/custom/lite-yd/image/back{{backgroundColor!='#ffffff'?'-light':''}}.png"></image>
</view>
<view class="home flex-vc" bindtap="home" wx:if="{{disHome}}">
<image class="home-image"
src="http://qn.colorcun.com/custom/lite-yd/image/home{{backgroundColor!='#ffffff'?'-light':''}}.svg"></image>
src="http://nosqn.colorcun.com/custom/lite-yd/image/home{{backgroundColor!='#ffffff'?'-light':''}}.svg"></image>
</view>
</view>
<view class="title" bindtap="home">
... ... @@ -23,5 +23,4 @@
</view>
</view>
</view>
<fb></fb>
\ No newline at end of file
</view>
\ No newline at end of file
... ...
<view wx:if="{{!network}}" class="no-network">
<view class="no-network-box flex-vc" style="background:#fff;width:100%;height:500px;">
<image src="http://qn.colorcun.com/custom/lite/image/reminder.png" class="network-image"></image>
<image src="http://nosqn.colorcun.com/custom/lite/image/reminder.png" class="network-image"></image>
<view style="font-size:30rpx;margin-top:10rpx;color:#666;">网络不给力呀~</view>
<button type="warn" bindtap="refresh" style="margin-top:120px; width: 70%; background-color: #E14553; font-size: 34rpx; height: 80rpx;">
再试一次
... ...
... ... @@ -5,7 +5,7 @@
<cover-view class="close"></cover-view>
<cover-view class="title Semibold">选择菜系</cover-view>
<cover-view class="close">
<cover-image src="http://qn.colorcun.com/reserve/images/%E5%85%B3%20%20%E9%97%AD.png"></cover-image>
<cover-image src="http://nosqn.colorcun.com/reserve/images/%E5%85%B3%20%20%E9%97%AD.png"></cover-image>
</cover-view>
</cover-view>
<cover-view class="caixi-view flex-auto-ll">
... ... @@ -13,7 +13,7 @@
bindtap="active" data-index="{{index}}"
wx:for="{{multiArray[0]}}" wx:key="multiArray.key">
{{item}}
<cover-image class="number" wx:if="{{index>=1 && index<4}}" src="http://qn.colorcun.com/reserve/images/cx{{index}}.png"></cover-image>
<cover-image class="number" wx:if="{{index>=1 && index<4}}" src="http://nosqn.colorcun.com/reserve/images/cx{{index}}.png"></cover-image>
</cover-view>
</cover-view>
</cover-view>
... ...
... ... @@ -25,7 +25,7 @@
text-align: center;
}
.discount-name .close{
background-image: url("http://qn.colorcun.com/reserve/images/%E5%85%B3%20%20%E9%97%AD.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/%E5%85%B3%20%20%E9%97%AD.png");
width: 32rpx;
height: 32rpx;
position: absolute;
... ... @@ -49,7 +49,7 @@
width: 100%;
max-width: 690rpx;
height: 190rpx;
background-image: url("http://qn.colorcun.com/reserve/images/%E4%BC%98%E6%83%A0%E5%88%B8.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/%E4%BC%98%E6%83%A0%E5%88%B8.png");
margin-top: 40rpx;
}
.item .left{
... ...
... ... @@ -38,7 +38,7 @@
.timePicker .close{
width: 32rpx;
height: 32rpx;
background-image: url("http://qn.colorcun.com/reserve/images/ddate-close.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/ddate-close.png");
background-size: 100% 100%;
}
.title{
... ...
... ... @@ -28,7 +28,7 @@
margin-bottom: 60rpx;
}
.close{
background-image: url("http://qn.colorcun.com/reserve/images/close.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/close.png");
background-size: 100% 100%;
width: 32rpx;
height: 32rpx;
... ...
... ... @@ -48,7 +48,7 @@
margin-right: 20rpx;
width: 22rpx;
height:26rpx;
background-image: url("http://qn.colorcun.com/reserve/images/addr.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/addr.png");
background-size: 100% 100%;
min-width: 22rpx;
}
... ... @@ -63,7 +63,7 @@
padding: 20rpx;
}
.item-1 .icon {
background-image: url("http://qn.colorcun.com/reserve/images/sea-se.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/sea-se.png");
width: 36rpx;
height: 36rpx;
min-width: 36rpx;
... ... @@ -100,13 +100,13 @@
width: 20rpx;
height: 24rpx;
min-width: 20rpx;
background-image: url("http://qn.colorcun.com/reserve/images/addr.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/addr.png");
}
.history .icon-1{
width: 24rpx;
height: 18rpx;
min-width: 24rpx;
background-image: url("http://qn.colorcun.com/reserve/images/his-se.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/his-se.png");
}
.activity{
position: relative;
... ... @@ -118,7 +118,7 @@
width: 32rpx;
margin-left: 10rpx;
min-width: 32rpx;
background-image: url("http://qn.colorcun.com/reserve/images/huizi.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/huizi.png");
background-size: 100% 100%;
top:4rpx;
}
... ...
... ... @@ -3,7 +3,7 @@
<cover-view class="mask" hidden="{{hidden}}">
<cover-view class="header flex-lr" style="height: {{titleBarHeight}}px;padding-top: {{statusBarHeight}}px;" catchtap="hide">
<cover-view class="searchList flex-ll">
<cover-image class="icon" src="http://qn.colorcun.com/reserve/images/hasMap.png"></cover-image>
<cover-image class="icon" src="http://nosqn.colorcun.com/reserve/images/hasMap.png"></cover-image>
<cover-view class="title">地图</cover-view>
</cover-view>
<cover-view class="title" style="line-height: {{titleBarHeight}}px;height:{{titleBarHeight}}px;">一键订</cover-view>
... ...
... ... @@ -85,11 +85,11 @@
margin-right: 10rpx;
}
.picker .more{
background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB.png");
width: 12rpx;
height: 16rpx;
min-width:12rpx;
}
.tags.active .picker .more{
background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png");
}
\ No newline at end of file
... ...
... ... @@ -2,7 +2,7 @@
<cover-view class="seller flex-ll {{sellerStyle}}" >
<cover-view class="image">
<cover-image mode="aspectFill"
src="{{seller.seller_image?seller.seller_image+'?imageView2/2/w/320/interlace/0/q/100':'http://qn.colorcun.com/custom/lite-online/image/seller-def.png'}}"></cover-image>
src="{{seller.seller_image?seller.seller_image+'?imageView2/2/w/320/interlace/0/q/100':'http://nosqn.colorcun.com/custom/lite-online/image/seller-def.png'}}"></cover-image>
<view class="room_num" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>
</cover-view>
<cover-view class="info flex-tb">
... ... @@ -36,7 +36,7 @@
<block wx:if="{{seller.average>0 && hasAverage}}">¥{{seller.average}}元/人</block>
</cover-view>
<cover-view class="phone flex-ll" id="reserve-button" catchtap="tapButton" data-type="oncall">
<cover-image src="http://qn.colorcun.com/custom/lite-online/image/phone.png"></cover-image>
<cover-image src="http://nosqn.colorcun.com/custom/lite-online/image/phone.png"></cover-image>
<cover-view class="reserve-text">预订</cover-view>
</cover-view>
</cover-view>
... ...
... ... @@ -168,7 +168,7 @@
white-space:nowrap;
}
.activity-swiper .icon-hui{
background-image: url("http://qn.colorcun.com/reserve/images/%E6%83%A0.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/%E6%83%A0.png");
background-size: 100% 100%;
height: 32rpx;
width: 32rpx;
... ...
... ... @@ -3,7 +3,7 @@
<view class="seller flex-ll {{sellerStyle}}" >
<view class="image">
<image mode="aspectFill"
src="{{seller.seller_image?seller.seller_image+'?imageView2/2/w/320/interlace/0/q/100':'http://qn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png'}}"></image>
src="{{seller.seller_image?seller.seller_image+'?imageView2/2/w/320/interlace/0/q/100':'http://nosqn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png'}}"></image>
<view class="room_num" wx:if="{{false}}">{{seller.room_num}}个包间</view>
<view class="room_num hasBrand Semibold" wx:if="{{hasBrand && seller.brand}}">{{seller.brand.name}}</view>
</view>
... ... @@ -11,7 +11,8 @@
<view style="max-width: 100%;width: 100%;">
<view class="name Semibold flex-ll">
<view class="sellername">{{seller.sellername}}</view>
<view class="ActivityShort" wx:if="{{hasActivityShort && seller.activity.length>0}}"></view>
<view class="ActivityShort" wx:if="{{hasActivityShort && seller.is_discount>0}}"></view>
<view class="isopen_md" wx:if="{{hasActivityShort && seller.isopen_md==1}}">买单</view>
</view>
<view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view>
<view class="text flex-ll" wx:if="{{seller.cate.length>0}}">
... ...
... ... @@ -177,7 +177,7 @@
white-space:nowrap;
}
.activity-swiper .icon-hui{
background-image: url("http://qn.colorcun.com/reserve/images/%E6%83%A0.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/%E6%83%A0.png");
background-size: 100% 100%;
height: 32rpx;
width: 32rpx;
... ... @@ -194,7 +194,7 @@
width: 32rpx;
margin-left: 10rpx;
min-width: 32rpx;
background-image: url("http://qn.colorcun.com/reserve/images/huizi.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/huizi.png");
background-size: 100% 100%;
}
.seller .image .room_num.hasBrand{
... ... @@ -228,9 +228,22 @@
max-width: 320rpx;
}
.reserve-icon{
background-image: url("http://qn.colorcun.com/reserve/images/ding.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/ding.png");
width: 24rpx;
height: 24rpx;
background-size: 100% 100%;
margin-right: 10rpx;
}
.isopen_md{
width:52rpx;
height:32rpx;
border-radius:4rpx;
border:2rpx solid rgba(146,231,61,1);
font-size:20rpx;
font-family:PingFangSC-Semibold,PingFang SC;
font-weight:600;
color:rgba(125,199,66,1);
line-height:32rpx;
text-align: center;
margin-left: 6rpx;
}
\ No newline at end of file
... ...
... ... @@ -11,7 +11,7 @@
<cover-view class="type">潮汕火锅</cover-view>
</cover-view>
<cover-view class="info flex-ll">
<cover-image src="http://qn.colorcun.com/custom/lite-yd/image/add-act.png" style="width: 30rpx; height: 30rpx; background-color: #F4A22A"></cover-image>
<cover-image src="http://nosqn.colorcun.com/custom/lite-yd/image/add-act.png" style="width: 30rpx; height: 30rpx; background-color: #F4A22A"></cover-image>
<cover-view class="type">在线订座买单8折起</cover-view>
</cover-view>
<cover-view class="info flex-ll">
... ... @@ -19,7 +19,7 @@
<cover-view class="type">赠送精美小菜和饮品</cover-view>
</cover-view>
<cover-view class="info flex-ll" style="margin-top: 22rpx;">
<cover-image src="http://qn.colorcun.com/custom/lite-yd/image/gps-icon.png" style="width: 26rpx; height: 32rpx;"></cover-image>
<cover-image src="http://nosqn.colorcun.com/custom/lite-yd/image/gps-icon.png" style="width: 26rpx; height: 32rpx;"></cover-image>
<cover-view class="type" catchtap="lookLocation">{{seller.map_address}}</cover-view>
</cover-view>
<cover-view class="body"></cover-view>
... ...
// components/reserve/discount.js
import App from '../../../utils/api'
Component({
/**
* 组件的属性列表
*/
properties: {
cla:String,
seller:{
type:Object,
value:{}
}
},
/**
* 组件的初始数据
*/
data: {
display:false,
hiddenAni:'',
mycards:[],
money:0,//最大优惠
red_envelopes_price:0,//获得金额
},
lifetimes: {
// 生命周期函数，可以为函数，或一个在methods段中定义的方法名
attached: function () {
App.Customer.SetCardRel({
sid:this.data.seller.id
}).then(res=>{
if(!res.data) return;
this.setData({
red_envelopes_price:res.data.red_envelopes_price,
money:res.data.money,
mycards:res.data.list,
})
if(res.data.red_envelopes_price>0){
setTimeout(()=>{
this.setData({
red_envelopes_price:0,
})
},3000)
}
})
},
moved: function () { },
detached: function () { },
},
/**
* 组件的方法列表
*/
methods: {
hide(){
this.setData({
hiddenAni:'discountHide',
})
this.triggerEvent('hide')
setTimeout(()=>{
this.setData({
display:false,
hiddenAni:'',
})
},250)
},
show(){
this.setData({
display:true,
hiddenAni:'',
})
this.triggerEvent('show')
},
useCard(){
this.hide()
this.triggerEvent('event',{type:'gotoReserve'})
},
},
})
... ...
{
"component": true,
"usingComponents": {
"quan":"./quan"
}
}
\ No newline at end of file
... ...
<!--components/reserve/discount.wxml-->
<view class="toast flex-vc" wx:if="{{red_envelopes_price>0}}">
<view style="text-align: center;">恭喜您获得<text>{{red_envelopes_price}}元红包</text></view>
</view>
<view class="{{cla?cla:'tips reserve-detail'}}" wx:if="{{money>0 && red_envelopes_price==0 && seller.isopen_md==1}}">
<view class="msg">
{{money}}元
<view class="jiao"></view>
</view>
</view>
<view class="mask" bindtap="hide" wx:if="{{display}}">
<view class="discount {{hiddenAni}}" catchtap="">
<view class="discount-name Medium" bindtap="hide">
优惠
<view class="close"></view>
</view>
<view class="discount-content">
<view class="activity">
<view class="txt">活动</view>
<view class="flex-ll activity-item" wx:if="{{seller.receive_condition_2}}"
style="align-items: flex-start">
<view class="activity-left">消费返</view>
<view class="activity-right">在线买单{{seller.receive_condition_str}}红包</view>
</view>
<view class="flex-ll activity-item" wx:if="{{seller.isopen_md==1}}"
style="align-items: flex-start">
<view class="activity-left">平台红包</view>
<view class="activity-right">可叠加使用平台红包</view>
</view>
</view>
<block wx:if="{{mycards.length>0}}">
<view class="mycards-txt">已领取的红包</view>
<view class="mycards">
<view class="mycards-item" wx:for="{{mycards}}" wx:key="mycards">
<quan quan="{{item}}">
<view class="button-use" bindtap="useCard">立即使用</view>
</quan>
<view class="quan-tips">仅可在预订包间、在线买单时使用</view>
</view>
</view>
</block>
</view>
</view>
</view>
... ...
/* components/reserve/discount.wxss */
@import "../../../app.wxss";
.discount{
position: fixed;
bottom: 0;
background-color: #ffffff;
border-radius: 40rpx 40rpx 0rpx 0rpx;
color: #353535;
width: 100%;
padding: 20rpx 40rpx 40rpx;
animation: discountShow 0.3s;
box-sizing: border-box;
min-height: 648rpx;
}
.discount-content{
max-height: 792rpx;
overflow-y: auto;
}
.discount.discountHide{
animation: discountHide 0.3s;
}
.discount view{
background-size: 100% 100%;
}
.discount-name{
font-size: 32rpx;
height: 84rpx;
line-height: 84rpx;
width: 100%;
position: relative;
text-align: center;
}
.discount-name .close{
background-image: url("http://nosqn.colorcun.com/sellerbaobao/close.png");
width: 28rpx;
height: 29rpx;
position: absolute;
right:0;
top:6rpx;
}
.activity{
margin-top: 40rpx;
}
.activity .txt{
width:60rpx;
height:42rpx;
font-size:30rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(136,136,136,1);
line-height:42rpx;
}
.activity-item{
margin-top: 20rpx;
}
.activity-left{
height:28rpx;
border-radius:4rpx;
border:2rpx solid rgba(248,164,135,1);
font-size:20rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(240,88,36,1);
line-height:28rpx;
padding: 0 6rpx;
min-width: 60rpx;
text-align: center;
}
.activity-right{
font-size:26rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(53,53,53,1);
line-height:36rpx;
margin-left: 40rpx;
}
.mycards-txt{
height:42rpx;
font-size:30rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(136,136,136,1);
line-height:42rpx;
margin-top: 50rpx;
}
.mycards{
margin-top: 20rpx;
/*max-height: 430rpx;*/
}
.quan-tips{
height:50rpx;
background:rgba(245,245,245,1);
border-radius:0rpx 0rpx 10rpx 10rpx;
font-size:22rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(136,136,136,1);
line-height:50rpx;
padding-left: 36rpx;
width: 100%;
box-sizing: border-box;
}
.mycards-item{
margin-bottom: 20rpx;
}
.button-use{
width:120rpx;
height:44rpx;
background:linear-gradient(180deg,rgba(231,66,88,1) 0%,rgba(243,53,78,1) 100%);
border-radius:6rpx;
font-size:24rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(255,227,192,1);
line-height:44rpx;
text-align: center;
}
@keyframes discountShow
{
from {bottom: -876rpx;}
to {bottom: 0rpx;}
}
@keyframes discountHide
{
from {bottom: 0;}
to {bottom: -876rpx;}
}
.toast{
min-height:80rpx;
min-width:380rpx;
background:rgba(53,53,53,0.8);
border-radius:20rpx;
font-size:32rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(255,255,255,1);
line-height:44rpx;
position: fixed;
top:60%;
left:calc(50% - 190rpx);
padding: 10rpx 20rpx;
box-sizing: border-box;
z-index: 9999;
}
.toast text{
color:#FEDE68;
}
.tips{
position: fixed;
z-index: 9999;
background:rgba(84,83,84,0.8);
font-size:24rpx;
font-weight:500;
color:rgba(255,255,255,1);
}
.tips .msg{
height: 70rpx;
line-height: 70rpx;
padding: 0 24rpx;
position: relative;
}
.jiao{
width: 26rpx;
height: 10rpx;
background-image: url("http://nosqn.colorcun.com/activity/images/jiao2.png");
background-size: 100% 100%;
position: absolute;
bottom: -10rpx;
left:30rpx;
}
.tips.reserve-detail{
bottom:122rpx;
right:30rpx;
}
.tips.reserve-detail .jiao{
right:80rpx;
left:auto;
}
.tips.reserve-detail .msg{
color: #FEDE68;
}
.tips.reserve-detail .msg:before{
content: "预订买单，立即抵扣";
color:rgba(255,255,255,1);
}
.detail_owner .jiao{
display: none;
}
.detail_owner .msg:after{
content: "红包待用";
text-indent: -4rpx;
display: inline-block;
}
.money-tips{
min-width:184rpx;
height:34rpx;
padding: 0 20rpx;
background:rgba(240,85,34,1);
border-radius:16rpx 16rpx 16rpx 0rpx;
font-size:20rpx;
font-weight:500;
color:rgba(255,255,255,1);
line-height:34rpx;
position: absolute;
top:-28rpx;
right:-16rpx;
}
.checkout-button-money-tips{
min-width:184rpx;
padding: 0 20rpx;
height:34rpx;
background:rgba(240,85,34,1);
border-radius:16rpx 16rpx 16rpx 0rpx;
font-size:20rpx;
font-weight:500;
color:rgba(255,255,255,1);
line-height:34rpx;
position: absolute;
top:-28rpx;
right:40rpx;
}
.seller-reserve{
display: none;
}
\ No newline at end of file
... ...
// components/common/feedback.js
const mans=[
'oB-xJ5KJCIasaEdgMRckqoL1cwg8', //vking.wang
//'oB-xJ5BjnTvdgQGLHsjioNHH0eE8',
'oB-xJ5MEi2mTMrBTiYImD9cpGH6o', //xiao qin qin
'oB-xJ5OE1pM_17vNyWSMGqLH1vOg', //驴肉火烧多少钱一斤 MI 8
'oB-xJ5DIWrC6MECaXfql2GvTmQTU', //红旗 Redmi Note 7 Pro
'oB-xJ5I39RVWOWq-IGoBDxcFY-3s', //曹可 iPhone 6s Plus<iPhone8,2>
];
// components/reserve/seller/quan.js
Component({
/**
* 组件的属性列表
*/
properties: {
quan:Object,
cla:String,
},
/**
* 组件的初始数据
*/
data: {
hasDispaly:false,
top:(Math.random()*70+10)
},
ready: function() {
if(!console.hasRewrite){
const logger =wx.getLogManager()
let consoleLog=console.log
console.hasRewrite=true
console.log.prototype=function(){
console.log(...arguments)
logger.debug(...arguments)
};
}
let openid=wx.getStorageSync('customer_openid');
if(!openid) return;
if(mans.includes(openid)){
this.setData({
hasDispaly:true,
top:(Math.random()*70+10)
})
}
},
/**
* 组件的方法列表
*/
... ...
<!--components/reserve/seller/quan.wxml-->
<wxs src="../../../utils/util.wxs" module="util" />
<view class="quan flex-lr {{cla}}">
<view class="money Semibold flex-cc money-{{util.toFixed(quan.price,0).length}}" style="align-items: flex-end">
<view class="dot">￥</view>
<view class="number">{{util.toFixed(quan.price,0)}}</view>
</view>
<view class="line"></view>
<view class="type">
<view class="card_title">{{quan.card_title}}</view>
<view class="card-date" wx:if="{{quan.start_time>0}}">
{{util.unixtoTime(quan.start_time,"YYYY.MM.DD")}}-{{util.unixtoTime(quan.end_time,"YYYY.MM.DD")}}
</view>
<view class="card-date" wx:else="">
长期有效
</view>
</view>
<view class="opt">
<slot></slot>
</view>
</view>
... ...
/* components/reserve/seller/quan.wxss */
@import "/app.wxss";
.quan{
width:100%;
height:170rpx;
background:rgba(255,239,223,1);
box-sizing: border-box;
padding: 36rpx;
padding-right: 22rpx;
padding-left: 0;
border-radius:10rpx 10rpx 0rpx 0rpx;
border-right: 14rpx solid #fefefe;
position: relative;
}
.quan:after{
background-size: 100% 100%;
background-image: url("http://nosqn.colorcun.com/sellerbaobao/rp2.png");
position: absolute;
top:0;
right:-14rpx;
width: 16rpx;
height: 170rpx;
content: "";
}
.quan .money{
min-width: 186rpx;
width: 186rpx;
overflow: hidden;
}
.quan .money-4,.quan .money-5{
min-width: 226rpx;
width: 226rpx;
overflow: hidden;
}
.quan .type{
width: 80%;
}
.dot{
width:22rpx;
height:50rpx;
font-size:36rpx;
font-family:PingFangSC-Semibold,PingFang SC;
font-weight:600;
color:rgba(204,65,17,1);
line-height:50rpx;
margin-bottom: 10rpx;
}
.number{
height:90rpx;
font-size:64rpx;
font-family:PingFangSC-Semibold,PingFang SC;
font-weight:600;
color:rgba(204,65,17,1);
line-height:90rpx;
margin-left: 10rpx;
}
.line{
height: 100rpx;
width:2rpx;
margin-right: 38rpx;
background-image: url("http://nosqn.colorcun.com/sellerbaobao/l-o2.png");
background-size: 2rpx 16rpx;
}
.card_title{
height:40rpx;
font-size:28rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(187,113,50,1);
line-height:40rpx;
}
.card-date{
height:32rpx;
font-size:22rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(187,113,50,1);
line-height:32rpx;
margin-top: 10rpx;
}
.quan-pt{
background:rgba(255,227,227,1);
}
.quan-pt:after{
background-image: url("http://nosqn.colorcun.com/sellerbaobao/rs2.png");
}
.quan-pt .dot,.quan-pt .number{
color:rgba(204,17,17,1);
}
.quan-pt .line{
background-image: url("http://nosqn.colorcun.com/sellerbaobao/l-r2.png");
}
.quan-pt .card_title,.quan-pt .card-date{
color:rgba(187,80,50,1);
}
.quan.bg-f5f5f5{
border-right: 14rpx solid #f5f5f5;
}
.quan-disabled{
background:rgba(245,245,245,1);
}
.quan-disabled:after{
background-image: url("http://nosqn.colorcun.com/sellerbaobao/rx2.png");
}
.quan-disabled .dot,.quan-disabled .number{
color:rgba(136,136,136,1);
}
.quan-disabled .line{
background-image: url("http://nosqn.colorcun.com/sellerbaobao/l-g2.png");
}
.quan-disabled .card_title,.quan-disabled .card-date{
color:rgba(136,136,136,1);
}
\ No newline at end of file
... ...
... ... @@ -14,16 +14,16 @@
background-size: 100% 100%;
}
.share-img.wechat{
background-image: url("http://qn.colorcun.com/reserve/share/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201906251004331.png");
background-image: url("http://nosqn.colorcun.com/reserve/share/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201906251004331.png");
}
.share-img.quanzi{
background-image: url("http://qn.colorcun.com/reserve/share/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20190625100433.png");
background-image: url("http://nosqn.colorcun.com/reserve/share/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20190625100433.png");
}
.share-img.qrcode{
background-image: url("http://qn.colorcun.com/reserve/share/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201906251004332.png");
background-image: url("http://nosqn.colorcun.com/reserve/share/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201906251004332.png");
}
.share-img.hwq{
background-image: url("http://qn.colorcun.com/reserve/images/hwq.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/hwq.png");
}
.share-name{
margin-top: 20rpx;
... ...
... ... @@ -13,7 +13,7 @@
{{showStatusStr}}
</view>
<view class="more" wx:else="">
<image src="http://qn.colorcun.com/custom/lite-yd/image/click.png"></image>
<image src="http://nosqn.colorcun.com/custom/lite-yd/image/click.png"></image>
</view>
</view>
</formids>
... ... @@ -39,7 +39,7 @@
</formids>
<view class="seller address flex-ll" catchtap="lookLocation" wx:if="{{hasAddress}}">
<view class="gps-icon">
<image src="http://qn.colorcun.com/custom/lite-yd/image/gps-icon.png"></image>
<image src="http://nosqn.colorcun.com/custom/lite-yd/image/gps-icon.png"></image>
</view>
<view class="address-txt">
{{seller.map_address}}
... ...
... ... @@ -2,7 +2,7 @@
<view class="flex-ll">
<view class="stat">
<view class="bg" style="background-color: {{color}};width: {{statnum}}%"></view>
<image src="http://qn.colorcun.com/custom/lite-online/image/%E9%95%82%E7%A9%BA%E6%98%9F%E6%98%9F.png"></image>
<image src="http://nosqn.colorcun.com/custom/lite-online/image/%E9%95%82%E7%A9%BA%E6%98%9F%E6%98%9F.png"></image>
</view>
<view class="stat-text" wx:if="{{hasShowText}}">{{stat}} 分</view>
</view>
... ...
... ... @@ -51,13 +51,13 @@
color:rgba(121,79,40,1);
}
.tip.yellow .more{
background-image: url("http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911181208295.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911181208295.png");
}
.tip.yellow .close{
background-image: url("http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20191118120829.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20191118120829.png");
}
.tip.yellow .jian{
background-image: url("http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911181208293.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911181208293.png");
}
.tip.black{
... ... @@ -82,11 +82,11 @@
right:150rpx;
margin-left: 0;
z-index: 9999;
background-image: url("http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911181208292.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911181208292.png");
}
.tip.black .close{
background-image: url("http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911181208291.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911181208291.png");
}
.tip.black .more{
background-image: url("http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911181208294.png");
background-image: url("http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911181208294.png");
}
\ No newline at end of file
... ...
<!--components/tips/add-to-lite.wxml-->
<cover-view class="discount" style="top:{{statusBarHeightFull+a2lHeight}}px;width:{{hidden?'100rpx':'720rpx'}};" bindtap="gotoDiscount">
<cover-view style="position: relative;height: 100%;">
<cover-image class="discount-img" src="http://qn.colorcun.com/reserve/images/%E6%83%A03.png"></cover-image>
<cover-view style="position: relative;" wx:if="{{!hidden}}">
<cover-image src="http://qn.colorcun.com/reserve/images/%E4%BC%98%E6%83%A0%E6%B4%BB%E5%8A%A83.png"></cover-image>
<cover-view class="discount-view">
<cover-view class="text">精选折扣，周到安排用户专享</cover-view>
<cover-view class="close" catchtap="hide"></cover-view>
</cover-view>
</cover-view>
</cover-view>
</cover-view>
\ No newline at end of file
<view class="discount" style="top:{{statusBarHeightFull+a2lHeight}}px;width:{{hidden?'100rpx':'720rpx'}};" bindtap="gotoDiscount">
<view style="position: relative;height: 100%;">
<image class="discount-img" src="http://nosqn.colorcun.com/reserve/images/%E6%83%A03.png"></image>
<view style="position: relative;" wx:if="{{!hidden}}">
<image class="discount-imgmax"
src="http://nosqn.colorcun.com/reserve/images/%E4%BC%98%E6%83%A0%E6%B4%BB%E5%8A%A83.png"></image>
<view class="discount-view">
<view class="text">精选折扣，周到安排用户专享</view>
<view class="close" catchtap="hide"></view>
</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -40,4 +40,8 @@
left:0;
width: 88rpx;
height: 88rpx;
}
.discount-imgmax{
height: 122rpx;
width: 100%;
}
\ No newline at end of file
... ...
... ... @@ -7,6 +7,7 @@ const properties={
confirmColor:{type:String,value:'#fff'},
header:{type:String,value:'确认信息'},
body:{type:String,value:'确认信息'},
cla:String,
};
Component({
options: {
... ...
<!--components/showModal/showModal.wxml-->
<view class="mask flex-vc" hidden="{{!hasShow}}">
<view class="mask flex-vc {{cla}}" hidden="{{!hasShow}}">
<view class="showModal">
<view class="header">
{{opt.header}}
... ...
... ... @@ -57,4 +57,22 @@
.footer .button-none.confirm{
}
.footer .button-none.cancel{
}
.checkout .body{
font-size:32rpx;
font-weight:500;
color:rgba(53,53,53,1);
line-height:44rpx;
margin-top: 32rpx;
}
.checkout .confirm{
width:320rpx;
height:80rpx;
background:rgba(36,35,32,1);
border-radius:10rpx;
font-size:32rpx;
font-family:PingFangSC-Semibold,PingFang SC;
font-weight:600;
color:rgba(255,255,255,1);
line-height:80rpx;
}
\ No newline at end of file
... ...
// component/menu/addDelete.js
import util from '../../utils/util';
import App from '../../utils/api';
Component({
/**
* 组件的属性列表
*/
properties: {
filePath:String,
},
/**
* 组件的初始数据
*/
data: {
},
attached(){
},
ready () {
},
detached(){
},
/**
* 组件的方法列表
*/
methods: {
Invoice(){
wx.chooseInvoiceTitle({
success:(res)=>{
console.log('wx.chooseInvoiceTitle',res)
this.triggerEvent('event',res)
},
fail:(efail)=>{
console.log('wx.chooseInvoiceTitle',efail)
if(efail.errMsg== "chooseInvoiceTitle:fail cancel") return;
wx.showModal({
title: '授权提示',
content: '您拒绝了获取发票抬头,请点击确定打开授权',
confirmColor: '#199095',
cancelColor: '#999',
success: function (res) {
if (res.confirm) {
util.setting();
}
}
})
},
})
},
}
})
... ...
{
"component": true,
"usingComponents": {
"formids": "/components/formids/formids"
}
}
\ No newline at end of file
... ...
<view bindtap="Invoice" style="width: 100%;">
<slot></slot>
</view>
\ No newline at end of file
... ...
@import "../../app.wxss";
\ No newline at end of file
... ...
... ... @@ -3,6 +3,7 @@ import util from '../../utils/util';
import App from '../../utils/api';
const subscribe=[
'ZwAkHfP8xUvBZKJn4VXsjRxUDTuCMjWqd8lTsdCPdks',//包厢预订通知 状态、预订门店、包厢名称、备注
'Pf1iEkCA8TnfeqEMkf-_338U78d4Js36pk6sbB0yem0',//消费金额反馈提醒 消费总额、包间名称、餐厅名称、预订日期
]
Component({
/**
... ... @@ -76,11 +77,14 @@ Component({
tplid:accept.toString()
})
},800)
this.triggerEvent('event',{type:'success'})
}else{
util.toast('订阅失败，请在设置中打开','none')
this.triggerEvent('event',{type:'fail'})
}
},
fail:(efail)=>{
this.triggerEvent('event',{type:'fail'})
console.log('wx.requestSubscribeMessage.fail',efail)
if(efail.errMsg.indexOf('not ended')) return;
wx.showModal({
... ...
// pack-activity/pages/money.js
import util from '../../utils/util';
import App from '../../utils/api';
Page({
/**
* 页面的初始数据
*/
data: {
list:[],
status:1,
},
page:1,
size:10,
hasMore:true,
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.GetUserCard()
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
if(this.hasMore){
this.page+=1
this.GetUserCard()
}
},
GetUserCard(){
App.Customer.GetUserCard({
status:this.data.status,
page:this.page,
size:this.size,
}).then(res=> {
let list=this.data.list
list=list.concat(res.data)
if(res.data.length<this.size){
this.hasMore=false
}
this.setData({
list: list
})
})
},
searchInit(){
this.page=1;
this.hasMore=true;
},
switchTab(e){
let status=util.attr(e,'status')
if(status==this.data.status) return;
this.searchInit();
this.setData({
status:status,
list:[],
})
setTimeout(()=>{
this.GetUserCard()
},0)
},
})
\ No newline at end of file
... ...
{
"backgroundTextStyle":"light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle":"black",
"usingComponents": {
"nav":"/components/nav/nav",
"quan":"/components/reserve/seller/quan"
}
}
\ No newline at end of file
... ...
<!--pack-activity/pages/money.wxml-->
<wxs src="../../utils/util.wxs" module="util" />
<nav hasHome>我的红包</nav>
<view class="tabs flex-lr">
<view class="tabs-item flex-vc {{status==2?'':'active'}}" bindtap="switchTab" data-status="1">
<view class="tabs-txt">已使用</view>
</view>
<view class="tabs-item flex-vc {{status==2?'active':''}}" bindtap="switchTab" data-status="2">
<view class="tabs-txt">已失效</view>
</view>
</view>
<view class="pages" wx:if="{{list.length>0}}">
<view class="list-view list-view-{{item.sid}}" wx:for="{{list}}" wx:key="list">
<view class="quan">
<quan quan="{{item}}" cla="quan-disabled">
<view class="button-use status-{{item.status}}"></view>
</quan>
<view class="quan-tips" wx:if="{{item.sid==0}}">适用于平台所有商家，预订包间、在线买单时使用</view>
<view class="quan-tips" wx:else="">仅可在预订包间、在线买单时使用</view>
</view>
</view>
</view>
<view class="flex-vc" wx:else="">
<view class="empty-img"></view>
<view class="empty-txt">{{status==1?'暂时没有已经使用的哦':'暂时没有已经失效的哦'}}</view>
</view>
... ...
/* pack-activity/pages/money.wxss */
.pages{
padding-bottom: 50rpx;
padding-top: 80rpx;
}
.list-view{
width: calc(100% - 40rpx);
margin-left: 20rpx;
background:rgba(255,255,255,1);
border-radius:20rpx;
box-sizing: border-box;
padding: 20rpx 20rpx 0rpx;
}
.sellername{
height:40rpx;
font-size:28rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(53,53,53,1);
line-height:40rpx;
}
.more{
margin-left: 10rpx;
}
.quan{
margin-top: 10rpx;
}
.quan-tips{
height:50rpx;
background:rgba(250,250,250,1);
border-radius:0rpx 0rpx 10rpx 10rpx;
font-size:22rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(174,174,174,1);
line-height:50rpx;
padding-left: 36rpx;
width: 100%;
box-sizing: border-box;
}
.button-use{
position: absolute;
top:-12rpx;
right:14rpx;
width:117rpx;
height:117rpx;
background-size: 100% 100%;
}
.status-1{
background-image: url("http://nosqn.colorcun.com/sellerbaobao/use.png");
}
.status-2{
background-image: url("http://nosqn.colorcun.com/sellerbaobao/lose.png");
}
.empty-img{
background-image: url("http://nosqn.colorcun.com/sellerbaobao/empty2.png");
background-size: 100% 100%;
width:302rpx;
height:408rpx;
margin-top: 300rpx;
}
.empty-txt{
height:44rpx;
font-size:32rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(53,53,53,1);
line-height:44rpx;
margin-top: 40rpx;
}
.tabs{
height: 80rpx;
line-height: 80rpx;
border-bottom: 2rpx solid #F5F5F5;
box-sizing: border-box;
width: 100%;
position: fixed;
background-color: #fefefe;
z-index: 2;
}
.tabs-item{
width: 50%;
height: 80rpx;
}
.tabs-txt{
height: 80rpx;
width: 120rpx;
box-sizing: border-box;
text-align: center;
}
.active .tabs-txt{
border-bottom: 4rpx solid #C0A369;
color:#C0A369;
}
\ No newline at end of file
... ...
// pack-activity/pages/money.js
import util from '../../utils/util';
import App from '../../utils/api';
Page({
/**
* 页面的初始数据
*/
data: {
list:[],
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
//this.GetUserCard()
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
this.selectComponent('#getpos').getPos();
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
if(this.hasMore){
this.page+=1;
this.GetUserCard()
}
},
page:1,
size:10,
hasMore:true,
GetUserCard(){
App.Customer.GetUserCard({
page:this.page,
size:this.size,
status:0,
lat:this.location.latitude,
lng:this.location.longitude,
}).then(res=> {
let list=this.data.list
list=list.concat(res.data)
if(res.data.length<this.size){
this.hasMore=false;
}
this.setData({
list: list
})
})
},
useCard(e){
let sid=util.attr(e,'sid')
if(sid>0) {
wx.navigateTo({
url: '/pages/reserve/detail?id=' + sid + '&activeTab=reserve'
})
}else{
//lat=39.62420161&lng=118.1174469&multiIndex=0&centre_pos=39.62420161,118.1174469&hasSuggestion=
wx.navigateTo({
url: util.http_build_query({
lat:this.location.latitude,
lng:this.location.longitude,
centre_pos:`${this.location.latitude},${this.location.longitude}`,
keyword:' ',
isopen_md:1,
multiIndex:0,
},'/pages/reserve/indexList'),
})
}
},
location:null,
onpos(e){
console.log('onpos',e);
this.location=e.detail
this.GetUserCard();
},
})
\ No newline at end of file
... ...
{
"backgroundTextStyle":"light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle":"black",
"usingComponents": {
"nav":"/components/nav/nav",
"quan":"/components/reserve/seller/quan",
"getpos":"/components/userinfo/getpos"
}
}
\ No newline at end of file
... ...
<!--pack-activity/pages/money.wxml-->
<wxs src="../../utils/util.wxs" module="util" />
<nav hasHome>我的红包</nav>
<view class="pages" wx:if="{{list.length>0}}">
<view class="list-view list-view-{{item.sid}}" wx:for="{{list}}" wx:key="list">
<navigator url="/pages/reserve/detail?id={{item.sid}}" hover-class="navigator-hover" wx:if="{{item.sid>0}}">
<view class="sellername flex-lr">
<view>{{item.sellername}}</view>
<view class="flex-rr">
点击进店
<view class="more"></view>
</view>
</view>
</navigator>
<view class="quan" wx:for="{{item.card_list}}" wx:key="card_list" wx:for-item="quan">
<quan quan="{{quan}}" cla="{{item.sid==0?'quan-pt bg-f5f5f5':''}}">
<view class="button-use" bindtap="useCard" data-sid="{{item.sid}}">立即使用</view>
</quan>
<view class="quan-tips pingtai" wx:if="{{item.sid==0}}">适用于平台所有商家，预订包间、在线买单时使用</view>
<view class="quan-tips" wx:else="">仅可在预订包间、在线买单时使用</view>
</view>
</view>
</view>
<view class="flex-vc" wx:else="">
<view class="empty-img"></view>
<view class="empty-txt">哎呀一个红包都没有呢</view>
</view>
<navigator url="./list" hover-class="navigator-hover">
<view class="more-link flex-cc">
<view>查看红包历史记录</view>
<view class="more"></view>
</view>
</navigator>
<getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos>
... ...
/* pack-activity/pages/money.wxss */
page{
background-color: #F5F5F5;
}
.pages{
padding-bottom: 150rpx;
}
.list-view{
width: calc(100% - 40rpx);
margin-left: 20rpx;
background:rgba(255,255,255,1);
border-radius:20rpx;
box-sizing: border-box;
padding: 20rpx 20rpx 40rpx;
margin-bottom: 20rpx;
}
.list-view-0{
background: none;
margin-top: 0rpx;
padding-bottom: 20rpx;
}
.sellername{
height:40rpx;
font-size:28rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(53,53,53,1);
line-height:40rpx;
}
.more{
margin-left: 10rpx;
}
.quan{
margin-top: 20rpx;
}
.quan-tips{
height:50rpx;
background:rgba(245,245,245,1);
border-radius:0rpx 0rpx 10rpx 10rpx;
font-size:22rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(136,136,136,1);
line-height:50rpx;
padding-left: 36rpx;
width: 100%;
box-sizing: border-box;
}
.pingtai{
background:rgba(255,255,255,1);
color:rgba(136,136,136,1);
}
.button-use{
width:120rpx;
height:44rpx;
background:linear-gradient(180deg,rgba(231,66,88,1) 0%,rgba(243,53,78,1) 100%);
border-radius:6rpx;
font-size:24rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(255,227,192,1);
line-height:44rpx;
text-align: center;
}
.more-link{
height:120rpx;
background:rgba(255,255,255,1);
box-shadow:0rpx -4rpx 10rpx 0rpx rgba(219,219,219,1);
position: fixed;
bottom:0;
left:0;
width: 100%;
line-height: 120rpx;
font-size:30rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(153,153,153,1);
}
.more-link .more{
margin-left: 20rpx;
}
.empty-img{
background-image: url("http://nosqn.colorcun.com/sellerbaobao/empty.png");
background-size: 100% 100%;
width:302rpx;
height:408rpx;
margin-top: 300rpx;
}
.empty-txt{
height:44rpx;
font-size:32rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(53,53,53,1);
line-height:44rpx;
margin-top: 40rpx;
}
\ No newline at end of file
... ...
// pack-activity/pages/index.js
import util from '../../utils/util';
import App from '../../utils/api';
Page({
/**
* 页面的初始数据
*/
data: {
activity:null,
count:0,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.options=options
let sys=wx.getSystemInfoSync();
if("wxwork"==sys.environment){
console.log('wxwork run pack-activity',options)
App.Task.GetTaskByOpenid({
...options
}).then(res=>{
this.options.id=options.aid
if(res.ret==200){
util.toast('恭喜获得红包','none')
setTimeout(()=>{
this.GetTaskInfos()
},300)
}
})
}
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
this.GetTaskInfos()
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
return {
title:this.data.activity.title,
path:'/pages/reserve/index',
imageUrl:this.data.activity.bgurl+'.share.jpg',
}
},
GetTaskInfos(){
App.Task.GetTaskInfos({
aid:this.options.id,
}).then(res=>{
let activity=res.data.activity
activity.list=res.data.task
let count=0
activity.list.forEach(t=>{
if(t.status==2){
count+=(t.price*1)
}
})
this.setData({
count:count.toFixed(2),
activity:activity
})
})
},
taskNextDo(e){
let index=util.attr(e,'index')
let task=this.data.activity.list[index]
let tid=task.id
,path=util.http_build_query({aid:this.data.activity.id,tid:tid},task.task_url||'/pack-activity/pages/yuding')
console.log(path)
if(task.status==0){
App.Task.SetTaskInfo({//领取任务
aid:this.data.activity.id,
tid:tid,
}).then(()=>{
this.GetTaskInfos()
wx.navigateTo({
url: path
})
})
}else if(task.status==1){
wx.navigateTo({
url: path
})
}else{
wx.navigateTo({
url: '/pack-activity/pack/pack'
})
}
},
})
\ No newline at end of file
... ...
{
"backgroundTextStyle":"light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle":"black",
"usingComponents": {
"nav":"/components/nav/nav"
}
}
\ No newline at end of file
... ...
<!--pack-activity/pages/index.wxml-->
<nav hasHome>周到安排</nav>
<view class="pages" style="background-color: {{activity.element}}">
<view class="banner">
<image mode="widthFix" src="{{activity.bgurl}}" style="width: 100%"></image>
<navigator url="/pack-activity/pages/rule?id={{activity.id}}" hover-class="navigator-hover">
<view class="guize">活动 规则</view>
</navigator>
<view class="nomoney" wx:if="{{activity.balance<=1000}}"></view>
</view>
<view class="content">
<navigator url="/pack-activity/pack/pack" hover-class="navigator-hover">
<view class="tips flex-lr">
<view>活动累计收入：{{count}}元</view>
<view class="flex-rr">
查看余额
<view class="more"></view>
</view>
</view>
</navigator>
<view class="list">
<view class="header flex-cc">
<view class="header-img lt"></view>
<view class="header-txt">完成任务得红包</view>
<view class="header-img gt"></view>
</view>
<view class="item flex-lr" wx:for="{{activity.list}}" wx:key="list">
<image class="icon" src="{{item.icon_url}}" mode="aspectFit"></image>
<view class="item-content">
<view class="item-title">{{item.title}}</view>
<view class="item-desc">{{item.desc}}</view>
</view>
<view class="opt" bindtap="taskNextDo" data-index="{{index}}" wx:if="{{activity.balance>1000}}">
<view class="opt-button status{{item.status}}">{{['领取','去完成','已完成'][item.status]}}</view>
<view class="opt-money">{{item.price}}元红包</view>
</view>
</view>
</view>
<view class="share-but">
<button class="button-none" open-type="share">分享活动</button>
</view>
</view>
</view>
... ...
/* pack-activity/pages/index.wxss */
.pages{
}
.banner{
width:100%;
background:linear-gradient(202deg,rgba(213,45,182,1) 0%,rgba(240,72,102,1) 100%);
position: relative;
}
.content{
height: 1020rpx;
width: calc(100% - 40rpx);
margin: 0 20rpx 0;
}
.tips{
width:100%;
height:50rpx;
background:rgba(53,53,53,0.3);
border-radius:30rpx;
box-sizing: border-box;
padding: 0 28rpx 0 40rpx;
font-size:24rpx;
font-weight:500;
color:rgba(255,255,255,1);
line-height:50rpx;
}
.more{
background-image: url("http://nosqn.colorcun.com/activity/images/more.png");
margin-left: 22rpx;
}
.guize{
width:40rpx;
height:120rpx;
background:rgba(53,53,53,0.29);
border-radius:10rpx 0rpx 0rpx 10rpx;
padding: 2rpx 10rpx 0;
box-sizing: border-box;
font-size:20rpx;
font-weight:500;
color:rgba(255,255,255,1);
line-height:28rpx;
position: absolute;
top:20rpx;
right:0;
}
.nomoney{
background-image: url("http://nosqn.colorcun.com/activity/images/nomoney.png");
width:176rpx;
height:144rpx;
right:24rpx;
bottom: 42rpx;
position: absolute;
background-size: 100% 100%;
}
.list{
background:rgba(255,255,255,1);
box-shadow:4rpx 4rpx 6rpx 4rpx rgba(218,61,69,1);
border-radius:20rpx;
margin-top: 20rpx;
box-sizing: border-box;
padding-top: 60rpx;
padding-bottom: 60rpx;
}
.header{
margin-bottom: 60rpx;
}
.header .header-txt{
width:236rpx;
height:44rpx;
font-size:32rpx;
font-weight:600;
color:rgba(204,17,39,1);
line-height:44rpx;
margin: 0 20rpx;
}
.header-img{
background-size: 100% 100%;
width: 70rpx;
height: 16rpx;
}
.header-img.gt{
background-image: url("http://nosqn.colorcun.com/activity/images/lt.png");
}
.header-img.lt{
background-image: url("http://nosqn.colorcun.com/activity/images/gt.png");
}
.list .item{
margin-bottom: 60rpx;
height: 94rpx;
padding: 0 20rpx;
box-sizing: border-box;
}
.list .item:last-child{
margin-bottom: 0;
}
.item .icon{
width: 94rpx;
height: 94rpx;
min-width: 94rpx;
}
.item-content{
margin-left: 10rpx;
width: 100%;
}
.opt{
width: 130rpx;
min-width: 130rpx;
}
.item-title{
height:44rpx;
font-size:32rpx;
font-weight:600;
color:rgba(53,53,53,1);
line-height:44rpx;
}
.item-desc{
height:34rpx;
font-size:24rpx;
font-weight:500;
color:rgba(153,153,153,1);
line-height:34rpx;
margin-top: 10rpx;
}
.opt-money{
height:28rpx;
font-size:20rpx;
font-weight:600;
color:rgba(230,34,57,1);
line-height:28rpx;
margin-top: 10rpx;
}
.opt-button{
box-sizing: border-box;
width:130rpx;
height:50rpx;
border-radius:25rpx;
border:2rpx solid rgba(235,41,65,1);
font-size:24rpx;
font-weight:600;
color:rgba(230,34,57,1);
line-height:50rpx;
text-align: center;
}
.opt-button.status0,.opt-button.status1{
background:linear-gradient(180deg,rgba(225,27,49,1) 0%,rgba(243,53,78,1) 100%);
box-shadow:0rpx 2rpx 4rpx 0rpx rgba(232,37,60,1),2rpx 0rpx 6rpx 0rpx rgba(255,172,171,1);
color:rgba(255,227,192,1);
}
.share-but{
width:400rpx;
height:80rpx;
background:linear-gradient(180deg,rgba(252,190,38,1) 0%,rgba(255,233,128,1) 100%);
box-shadow:0rpx 4rpx 8rpx 0rpx rgba(182,43,68,1);
border-radius:40rpx;
margin-top: 40rpx;
font-size:32rpx;
font-weight:600;
color:rgba(230,34,57,1);
line-height:80rpx;
text-align: center;
margin-left: calc(50% - 200rpx);
}
.share-but .button-none{
height: 80rpx;
line-height:80rpx;
}
\ No newline at end of file
... ...
// pack-activity/pages/money.js
import util from '../../utils/util';
import App from '../../utils/api';
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
})
\ No newline at end of file
... ...
{
"backgroundTextStyle":"light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle":"black",
"usingComponents": {
"nav":"/components/nav/nav"
}
}
\ No newline at end of file
... ...
<!--pack-activity/pages/money.wxml-->
<wxs src="../../utils/util.wxs" module="util" />
<nav hasHome>关注公众号</nav>
<view class="pages">
<view class="pages-view">
<view class="text">进入客服消息后，点击右下角快捷图片，长 按图片关注【周到安排】</view>
<image src="http://nosqn.colorcun.com/activity/images/kefux.png" mode="widthFix" style="width: 100%;"></image>
</view>
</view>
<view class="bottom">
<view class="bottom-view flex-vc">
<button class="button-love" open-type="contact"
send-message-title="关注公众号"
send-message-img="http://nosqn.colorcun.com/activity/images/kefu.jpg"
show-message-card>去客服页面关注</button>
<view class="tips">关注公众号，及时获取订包间专属优惠信息</view>
</view>
</view>
... ...
/* pack-activity/pages/money.wxss */
page{
background-color: #ffffff;
}
.pages{
background-image: url("http://nosqn.colorcun.com/activity/images/money-header.png");
background-size: 100% auto;
background-repeat: no-repeat;
min-height: 500rpx;
padding-top: 80rpx;
}
.pages-view{
width: calc(100% - 40rpx);
margin-left: 20rpx;
height:340rpx;
background:#ffffff;
border-radius:20rpx;
box-sizing: border-box;
padding: 40rpx 20rpx;
}
.text{
padding: 0 30rpx;
font-size:32rpx;
font-weight:600;
color:rgba(53,53,53,1);
line-height:44rpx;
margin-bottom: 80rpx;
}
.bottom{
position: fixed;
bottom: 0;
height: 220rpx;
width: 100%;
}
.bottom-view{
width: 100%;
}
.button-love{
width:674rpx;
height:80rpx;
background:linear-gradient(360deg,rgba(220,44,75,1) 0%,rgba(244,143,161,1) 100%);
border-radius:40rpx;
font-size:32rpx;
font-weight:600;
color:rgba(255,255,255,1);
line-height:80rpx;
letter-spacing:1rpx;
}
.tips{
margin-top: 24rpx;
height:36rpx;
font-size:26rpx;
font-weight:500;
color:rgba(153,153,153,1);
line-height:36rpx;
}
\ No newline at end of file
... ...
// pack-activity/pages/money.js
import util from '../../utils/util';
import App from '../../utils/api';
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
App.User.GetBalance().then(res=>{
this.setData({
user:res.data
})
})
App.User.GetConsume().then(res=>{
this.setData({
list:res.data
})
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
})
\ No newline at end of file
... ...
{
"backgroundTextStyle":"light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle":"black",
"usingComponents": {
"nav":"/components/nav/nav"
}
}
\ No newline at end of file
... ...
<!--pack-activity/pages/money.wxml-->
<wxs src="../../utils/util.wxs" module="util" />
<nav hasHome>我的余额</nav>
<view class="pages">
<view class="pages-view">
<view class="money-block">
<view class="money-views-top">
<view class="txt">我的余额</view>
</view>
<view class="money-views flex-bc">
<view class="money-number">{{user.price}}</view>
<view class="money-dw">元</view>
</view>
<navigator url="/pages/reserve/index" open-type="switchTab" hover-class="other-navigator-hover">
<view class="yuding flex-cc">
<view class="icon"></view>
去订包间
</view>
</navigator>
</view>
</view>
<view class="list-view" wx:if="{{list.length>0}}">
<view class="item" wx:for="{{list}}" wx:key="list">
<view class="flex-lr name">
<view>{{item.remark}}</view>
<view>{{item.type==1?'+':'-'}}{{item.consumeprice}}</view>
</view>
<view class="flex-lr date">
<view>{{util.unixtoTime(item.createtime,"MM-DD HH:II")}}</view>
<view>余额 {{item.currprice}}</view>
</view>
</view>
</view>
</view>
... ...
/* pack-activity/pages/money.wxss */
page{
background-color: #F5F5F5;
}
.pages{
/*background-image: url("http://nosqn.colorcun.com/activity/images/money-header.png");*/
background-image: url("http://nosqn.colorcun.com/activity/images/bg-black.png");
background-size: 100% auto;
background-repeat: no-repeat;
min-height: 500rpx;
padding-top: 80rpx;
}
.pages-view{
width: calc(100% - 40rpx);
margin-left: 20rpx;
height:340rpx;
background:#ffffff;
border-radius:20rpx;
box-sizing: border-box;
padding: 20rpx;
}
.money-block{
height:300rpx;
background:rgba(255,255,255,1);
border-radius:20rpx;
padding-top: 40rpx;
box-sizing: border-box;
}
.money-views-top{
width: 258rpx;
height: 40rpx;
font-size:28rpx;
margin-left: calc(50% - 126rpx);
text-align: center;
font-weight:500;
color:rgba(153,153,153,1);
line-height:40rpx;
position: relative;
}
.money-views-top:before{
position: absolute;
display: block;
content: "";
width: 100%;
height: 2rpx;
left:0;
top:19rpx;
background-color: #E0E0E0;
}
.money-views-top .txt{
width: 138rpx;
background-color: #ffffff;
left:60rpx;
position: absolute;
}
.money-views{
height:100rpx;
font-size:72rpx;
font-weight:600;
color:#353535;
line-height:100rpx;
margin-top: 10rpx;
}
.money-dw{
width:32rpx;
height:44rpx;
font-size:32rpx;
font-weight:600;
color:#353535;
line-height:44rpx;
margin-left: 20rpx;
}
.list-view{
width: calc(100% - 40rpx);
margin-left: 20rpx;
background:rgba(255,255,255,1);
border-radius:20rpx;
box-sizing: border-box;
padding: 2rpx 40rpx 0;
margin-top: 20rpx;
}
.item{
height: 166rpx;
box-sizing: border-box;
border-bottom: 2rpx solid #F5F5F5;
line-height: 166rpx;
padding-top: 40rpx;
}
.item:last-child{
border-bottom-width: 0;
}
.item .name{
height:44rpx;
font-size:32rpx;
font-weight:500;
color:rgba(53,53,53,1);
line-height:44rpx;
box-sizing: border-box;
}
.item .date{
height:34rpx;
font-size:24rpx;
font-weight:500;
color:rgba(153,153,153,1);
line-height:34rpx;
margin-top: 10rpx;
}
.yuding{
width:320rpx;
height:70rpx;
background:linear-gradient(360deg,rgba(192,163,105,1) 0%,rgba(252,210,167,1) 100%);
border-radius:35rpx;
font-size:32rpx;
font-family:PingFangSC-Semibold,PingFang SC;
font-weight:600;
color:rgba(123,81,42,1);
line-height:70rpx;
margin-left: calc(50% - 160rpx);
margin-top: 40rpx;
}
.yuding .icon{
background-size: 100% 100%;
width: 30rpx;
height: 30rpx;
background-image: url("http://nosqn.colorcun.com/activity/images/addr.png");
margin-right: 20rpx;
}
\ No newline at end of file
... ...
// pack-activity/pages/money.js
import util from '../../utils/util';
import App from '../../utils/api';
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
})
\ No newline at end of file
... ...
{
"backgroundTextStyle":"light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle":"black",
"usingComponents": {
"nav":"/components/nav/nav"
}
}
\ No newline at end of file
... ...
<!--pack-activity/pages/money.wxml-->
<wxs src="../../utils/util.wxs" module="util" />
<nav hasHome>添加企业微信</nav>
<view class="pages">
<view class="pages-view">
<view class="text">【周到安排】已为您分配专属客服，订包间相关的任何问题，都可以撩我</view>
<image src="http://nosqn.colorcun.com/activity/images/kefux.png" mode="widthFix" style="width: 100%;"></image>
</view>
</view>
<view class="bottom">
<view class="bottom-view flex-vc">
<button class="button-love" open-type="contact"
send-message-title="添加企业微信"
send-message-img="http://nosqn.colorcun.com/activity/images/kefu.jpg"
show-message-card>去客服页面关注</button>
<view class="tips">添加企业微信，及时获知红包领取详情</view>
</view>
</view>
... ...
/* pack-activity/pages/money.wxss */
page{
background-color: #ffffff;
}
.pages{
background-image: url("http://nosqn.colorcun.com/activity/images/money-header.png");
background-size: 100% auto;
background-repeat: no-repeat;
min-height: 500rpx;
padding-top: 80rpx;
}
.pages-view{
width: calc(100% - 40rpx);
margin-left: 20rpx;
height:340rpx;
background:#ffffff;
border-radius:20rpx;
box-sizing: border-box;
padding: 40rpx 20rpx;
}
.text{
padding: 0 30rpx;
font-size:32rpx;
font-weight:600;
color:rgba(53,53,53,1);
line-height:44rpx;
margin-bottom: 80rpx;
}
.bottom{
position: fixed;
bottom: 0;
height: 220rpx;
width: 100%;
}
.bottom-view{
width: 100%;
}
.button-love{
width:674rpx;
height:80rpx;
background:linear-gradient(360deg,rgba(220,44,75,1) 0%,rgba(244,143,161,1) 100%);
border-radius:40rpx;
font-size:32rpx;
font-weight:600;
color:rgba(255,255,255,1);
line-height:80rpx;
letter-spacing:1rpx;
}
.tips{
margin-top: 24rpx;
height:36rpx;
font-size:26rpx;
font-weight:500;
color:rgba(153,153,153,1);
line-height:36rpx;
}
\ No newline at end of file
... ...
// pack-activity/pages/index.js
import util from '../../utils/util';
import App from '../../utils/api';
Page({
/**
* 页面的初始数据
*/
data: {
activity:null,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.options=options
let sys=wx.getSystemInfoSync();
this.setData({
height:sys.windowHeight,
})
this.GetTaskInfos()
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
this.GetTaskInfos()
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
return {
title:this.data.activity.title,
path:'/pages/reserve/index',
imageUrl:this.data.activity.bgurl+'.share.jpg',
}
},
GetTaskInfos(){
App.Task.GetTaskInfos({
aid:this.options.id,
}).then(res=>{
let activity=res.data.activity
activity.list=res.data.task
let count=0
activity.list.forEach(t=>{
if(t.status==2){
count+=(t.price*1)
}
})
this.setData({
count:count.toFixed(2),
activity:activity
})
})
},
taskNextDo(e){
let index=util.attr(e,'index')
let task=this.data.activity.list[index]
let tid=task.id
,path=util.http_build_query({aid:this.data.activity.id,tid:tid},task.task_url||'/pack-activity/pages/yuding')
console.log(path)
if(task.status==0){
App.Task.SetTaskInfo({//领取任务
aid:this.data.activity.id,
tid:tid,
}).then(()=>{
this.GetTaskInfos()
wx.navigateTo({
url: path
})
})
}else if(task.status==1){
wx.navigateTo({
url: path
})
}else{
wx.navigateTo({
url: '/pack-activity/pack/pack'
})
}
},
})
\ No newline at end of file
... ...
{
"backgroundTextStyle":"light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle":"black",
"usingComponents": {
"nav":"/components/nav/nav"
}
}
\ No newline at end of file
... ...
<!--pack-activity/pages/index.wxml-->
<nav hasHome>周到安排</nav>
<view class="pages"
wx:if="{{activity}}"
style="background-color: {{activity.element}};background-image:url('{{activity.bgurl}}.rule.png')">
<view class="content">
<view class="list">
<view class="header flex-cc">
<view class="header-img lt"></view>
<view class="header-txt">活动规则</view>
<view class="header-img gt"></view>
</view>
<view class="item">
<text space="nbsp" class="desc">{{activity.desc}}</text>
</view>
</view>
</view>
</view>
... ...
/* pack-activity/pages/index.wxss */
.pages{
padding: 78rpx 0 52rpx;
background-size: 100% auto;
background-repeat: no-repeat;
}
.content{
width: calc(100% - 40rpx);
margin: 0 20rpx 0;
}
.list{
background:rgba(255,255,255,1);
box-shadow:4rpx 4rpx 6rpx 4rpx rgba(218,61,69,1);
border-radius:10rpx;
padding-top: 72rpx;
padding-bottom: 44rpx;
}
.header{
margin-bottom: 40rpx;
}
.header .header-txt{
width:128rpx;
height:44rpx;
font-size:32rpx;
font-weight:600;
color:rgba(53,53,53,1);
line-height:44rpx;
margin: 0 20rpx;
}
.header-img{
background-size: 100% 100%;
width: 88rpx;
height: 8rpx;
}
.header-img.gt{
background-image: url("http://nosqn.colorcun.com/activity/images/rule.gt.png");
}
.header-img.lt{
background-image: url("http://nosqn.colorcun.com/activity/images/rule.lt.png");
}
.list .item{
margin-bottom: 60rpx;
padding: 0 20rpx;
box-sizing: border-box;
}
.list .item:last-child{
margin-bottom: 0;
}
.item .icon{
width: 94rpx;
height: 94rpx;
min-width: 94rpx;
}
.item-content{
margin-left: 10rpx;
width: 100%;
}
.desc{
font-size:28rpx;
font-weight:500;
color:rgba(53,53,53,1);
line-height:40rpx;
}
\ No newline at end of file
... ...
// pack-activity/pages/index.js
import util from '../../utils/util';
import App from '../../utils/api';
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.options=options
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
})
\ No newline at end of file
... ...
{
"backgroundTextStyle":"light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle":"black",
"usingComponents": {
"nav":"/components/nav/nav"
}
}
\ No newline at end of file
... ...
<!--pack-activity/pages/index.wxml-->
<nav hasHome>订包间</nav>
<view class="pages">
<image src="http://nosqn.colorcun.com/activity/images/yuding.png" style="width: 100%;" mode="widthFix"></image>
<navigator url="/pages/reserve/index" open-type="switchTab" hover-class="other-navigator-hover">
<view class="content flex-cc">
<view class="share-but">
<button class="button-none">去订包间</button>
</view>
</view>
</navigator>
</view>
... ...
/* pack-activity/pages/index.wxss */
.pages{
}
.content{
position: fixed;
bottom: 80rpx;
width: 100%;
}
.share-but{
height:80rpx;
background:linear-gradient(360deg,rgba(220,44,75,1) 0%,rgba(244,143,161,1) 100%);
border-radius:40rpx;
font-size:32rpx;
font-weight:600;
color:rgba(255,255,255,1);
line-height:44rpx;
letter-spacing:1rpx;
text-align: center;
width: calc(100% - 76rpx);
}
.share-but .button-none{
height: 80rpx;
line-height:80rpx;
}
\ No newline at end of file
... ...
... ... @@ -210,7 +210,8 @@ image{
}
.Medium{
font-weight: 400;
font-family:PingFangSC-Medium,PingFang SC;
font-weight: 500;
}
.button-none {
display: inline-block;
... ... @@ -237,7 +238,7 @@ image{
.more{
width: 12rpx;
height: 22rpx;
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/click.png");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/click.png");
background-size: 100%;
min-width: 12rpx;
}
... ...
<view style="height:{{height}}px;" class="nothing-page flex-vc bg-white">
<image class="nothing-booklist" src="http://qn.colorcun.com/custom/lite-yd/image/nothing-booklist.png"></image>
<image class="nothing-booklist" src="http://nosqn.colorcun.com/custom/lite-yd/image/nothing-booklist.png"></image>
<view class="black-font font34r smooth nothing-content">暂无内容</view>
</view>
\ No newline at end of file
... ...
... ... @@ -7,15 +7,15 @@ Component({
data: {
list: [
{
imgurl: 'http://qn.colorcun.com/custom/lite-yd/image/notice-wx.png',
imgurl: 'http://nosqn.colorcun.com/custom/lite-yd/image/notice-wx.png',
title: '微信'
},
{
imgurl: 'http://qn.colorcun.com/custom/lite-yd/image/notice-msg.png',
imgurl: 'http://nosqn.colorcun.com/custom/lite-yd/image/notice-msg.png',
title: '短信'
},
{
imgurl: 'http://qn.colorcun.com/custom/lite-yd/image/notice-call.png',
imgurl: 'http://nosqn.colorcun.com/custom/lite-yd/image/notice-call.png',
title: '电话'
}
],
... ... @@ -26,10 +26,10 @@ Component({
let list=this.data.list
let pl = this.data.bookInfo.phone ? this.data.bookInfo.phone.length : 0;
if (pl < 3) {
list[2].imgurl='http://qn.colorcun.com/custom/lite-yd/image/notice-call-disabled.png'
list[2].imgurl='http://nosqn.colorcun.com/custom/lite-yd/image/notice-call-disabled.png'
}
if (!/^1\d{10}$/.test(this.data.bookInfo.phone)) {
list[1].imgurl='http://qn.colorcun.com/custom/lite-yd/image/notice-msg-disabled.png'
list[1].imgurl='http://nosqn.colorcun.com/custom/lite-yd/image/notice-msg-disabled.png'
}
this.setData({
list:list,
... ...
<view class="selected-time flex-cc">
<view class="flex-vc padding-topbottom padding-left25" bindtap="reducePnum">
<image src="http://qn.colorcun.com/custom/lite-yd/image/reduce-act.png" class="select-act"></image>
<image src="http://nosqn.colorcun.com/custom/lite-yd/image/reduce-act.png" class="select-act"></image>
</view>
<input value="{{pnum}}" class="select-input flex-cc green-font font34r" bindunput="editpnum"/>
<view class="flex-vc padding-topbottom padding-right25" bindtap="addPnum">
<image src="http://qn.colorcun.com/custom/lite-yd/image/add-act.png" class="select-act"></image>
<image src="http://nosqn.colorcun.com/custom/lite-yd/image/add-act.png" class="select-act"></image>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -3,7 +3,7 @@
<view class="cancel" catchtap="catchtap">
<view class="flex-rr">
<view class="close" bindtap="hide">
<image src="http://qn.colorcun.com/custom/lite-yd/image/close.png"></image>
<image src="http://nosqn.colorcun.com/custom/lite-yd/image/close.png"></image>
</view>
</view>
<view class="title Semibold flex-vc">请选择取消原因</view>
... ...
... ... @@ -39,32 +39,32 @@
height: 100%;
}
.tabBar .reserve{
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/seller-tabs2-reserve.png");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/seller-tabs2-reserve.png");
}
.tabBar .checked .reserve{
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/seller-tabs2-reserve-checked.png");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/seller-tabs2-reserve-checked.png");
}
.tabBar .book{
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/seller-tabs2-book.png");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/seller-tabs2-book.png");
}
.tabBar .checked .book {
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/seller-tabs2-book-checked.png");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/seller-tabs2-book-checked.png");
}
.tabBar .setting{
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/seller-tabs2-setting.png");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/seller-tabs2-setting.png");
}
.tabBar .checked .setting {
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/seller-tabs2-setting-checked.png");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/seller-tabs2-setting-checked.png");
}
.tabBar .board{
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/seller-tabs2-boards.png");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/seller-tabs2-boards.png");
}
.tabBar .checked .board {
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/seller-tabs2-boards-checked.png");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/seller-tabs2-boards-checked.png");
}
.tabBar .order{
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/order.png?2");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/order.png?2");
}
.tabBar .checked .order {
background-image: url("http://qn.colorcun.com/custom/lite-yd/image/order-checked.png?2");
background-image: url("http://nosqn.colorcun.com/custom/lite-yd/image/order-checked.png?2");
}
... ...
... ... @@ -13,7 +13,7 @@
bindtap="calendarShow">
<view style="width: 80%" class="item-text">{{checked==2?util.unixtoTime(list[2].time,"MM-DD"):'其他'}}</view>
<image
src="http://qn.colorcun.com/custom/lite-yd/image/date{{checked==2?'.selected':''}}.png"
src="http://nosqn.colorcun.com/custom/lite-yd/image/date{{checked==2?'.selected':''}}.png"
style="min-width: 36rpx;width: 36rpx;height: 36rpx; margin-right: 22rpx;"></image>
</view>
</view>
... ...
... ... @@ -7,7 +7,7 @@
style="height:100%;" wx:if="{{timePickerMask}}">
<view class="timePicker">
<view class="flex-rr">
<image class="close" src="http://qn.colorcun.com/custom/lite-yd/image/add-act.png" bindtap="calendarClose"></image>
<image class="close" src="http://nosqn.colorcun.com/custom/lite-yd/image/add-act.png" bindtap="calendarClose"></image>
</view>
<view class="flex-cc" style="margin-bottom: 56rpx; font-size: 30rpx;">
<view bindtap="calendarClose">{{ddate_solt==1?'午市':ddate_solt==2?'晚市':'早市'}}</view>
... ...
// pack-book/components/checkout/confirm-price.js
import util from '../../../utils/util'
import App from '../../../utils/api'
Component({
/**
* 组件的属性列表
*/
properties: {
price:Number,
},
/**
* 组件的初始数据
*/
data: {
hidden:true,
},
/**
* 组件的方法列表
*/
methods: {
show(rid,files){
if(this.data.price<=0){
return util.toast('请设置金额','none')
}
let bill_list=[]
if(files.length>0){
let hasNok=false
files.some(f=>{
if(f.progress==100 && f.remote && f.remote.url){
bill_list.push(f.remote.url)
}else{
hasNok=true
}
})
if(hasNok){
return util.toast('请等待图片上传完成','none')
}
}
this.rid=rid
this.bill_list=bill_list
this.hasSubmit=true
this.setData({
hidden:false,
})
},
hide(){
this.setData({
hidden:true,
})
},
hasSubmit:true,
submit(){
this.hide()
if(!this.hasSubmit) return;
this.hasSubmit=false,
App.Customer.UpdateOrderInfo({
rid:this.rid,
bill_list:JSON.stringify(this.bill_list),
price:this.data.price,
}).then(()=>{
this.triggerEvent('event')
this.hasSubmit=true
}).catch(()=>{
this.triggerEvent('event')
this.hasSubmit=true
})
},
}
})
... ...
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
... ...
<!--pack-book/components/checkout/confirm-price.wxml-->
<view class="mask flex-vc" wx:if="{{!hidden}}">
<view class="confirm-price">
<view class="title flex-rr" bindtap="hide">
<view class="bg-img bg-c1"></view>
</view>
<view class="center flex-vc">
<view class="tips">应收金额</view>
<view class="price">¥ {{price}}</view>
<view class="submit" bindtap="submit">确认发送</view>
</view>
</view>
</view>
... ...
/* pack-book/components/checkout/confirm-price.wxss */
@import "/app.wxss";
.bg-img{
background-image: url("http://nosqn.colorcun.com/checkout/images/css_sprites.png");
zoom: 33.5%;
}
.bg-c1 {
width: 36px; height: 36px;
background: url('http://nosqn.colorcun.com/checkout/images/css_sprites.png') -209px -111px;
}
.confirm-price{
width: calc(100% - 144rpx);
height:426rpx;
background:rgba(255,255,255,1);
border-radius:10rpx;
}
.title{
height: 92rpx;
line-height: 92rpx;
padding: 0 36rpx;
}
.tips{
height:42rpx;
font-size:30rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(112,112,112,1);
line-height:42rpx;
}
.price{
height:92rpx;
font-size:66rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(53,53,53,1);
line-height:92rpx;
margin-top: 16rpx;
}
.submit{
width:334rpx;
height:84rpx;
background:rgba(25,144,149,1);
border-radius:10rpx;
font-size:34rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(254,254,254,1);
line-height:84rpx;
text-align: center;
margin-top: 40rpx;
}
\ No newline at end of file
... ...
... ... @@ -11,7 +11,7 @@
<view class="single-date gray-deep-font flex-vc">
<view class="font30r">更多</view>
<view class="date-num flex-vc">
<image src="http://qn.colorcun.com/custom/lite-yd/image/more-dot.png" class="more-dot"></image>
<image src="http://nosqn.colorcun.com/custom/lite-yd/image/more-dot.png" class="more-dot"></image>
</view>
</view>
</view>
... ...