Skip to content

Commit

Permalink
add game
Browse files Browse the repository at this point in the history
  • Loading branch information
@wuhou123
wuhou123 committed Aug 16, 2018
1 parent e53e035 commit 07d62c9
Show file tree
Hide file tree
Showing 9 changed files with 672 additions and 348 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
View file
@@ -1,5 +1,5 @@
{
"editor.fontSize": 18,
"editor.fontSize": 14,
"vetur.format.defaultFormatter.html": "js-beautify-html",
"files.associations": {
"*.vue": "vue",
Expand Down
2 changes: 1 addition & 1 deletion .wepycache
View file
@@ -1 +1 @@
{"D:\\wxxcx\\recode\\wxxcx\\node_modules\\wepy\\lib\\wepy.js":499162500000,"D:\\wxxcx\\recode\\wxxcx\\node_modules\\wepy-async-function\\index.js":1517302333000,"D:\\wxxcx\\recode\\wxxcx\\node_modules\\wepy-com-toast\\toast.wpy":1488432898000,"D:\\wxxcx\\recode\\wxxcx\\node_modules\\wepy\\lib\\app.js":499162500000,"D:\\wxxcx\\recode\\wxxcx\\node_modules\\wepy\\lib\\page.js":499162500000,"D:\\wxxcx\\recode\\wxxcx\\node_modules\\wepy\\lib\\component.js":499162500000,"D:\\wxxcx\\recode\\wxxcx\\node_modules\\wepy\\lib\\event.js":499162500000,"D:\\wxxcx\\recode\\wxxcx\\node_modules\\wepy\\lib\\base.js":499162500000,"D:\\wxxcx\\recode\\wxxcx\\node_modules\\wepy\\lib\\util.js":499162500000,"D:\\wxxcx\\recode\\wxxcx\\node_modules\\wepy\\lib\\mixin.js":499162500000,"D:\\wxxcx\\recode\\wxxcx\\node_modules\\wepy-async-function\\global.js":1517302333000,"D:\\wxxcx\\recode\\wxxcx\\node_modules\\promise-polyfill\\promise.js":1511627065000,"D:\\wxxcx\\recode\\wxxcx\\node_modules\\regenerator-runtime\\runtime.js":1493390741000,"D:\\wxxcx\\recode\\wxxcx\\node_modules\\wepy\\lib\\native.js":499162500000}
{"D:\\order\\wxxcx\\wxrecode\\node_modules\\wepy\\lib\\wepy.js":499162500000,"D:\\order\\wxxcx\\wxrecode\\node_modules\\wepy-async-function\\index.js":1517302333000,"D:\\order\\wxxcx\\wxrecode\\node_modules\\wepy-com-toast\\toast.wpy":1488432898000,"D:\\order\\wxxcx\\wxrecode\\node_modules\\wepy\\lib\\app.js":499162500000,"D:\\order\\wxxcx\\wxrecode\\node_modules\\wepy\\lib\\page.js":499162500000,"D:\\order\\wxxcx\\wxrecode\\node_modules\\wepy\\lib\\component.js":499162500000,"D:\\order\\wxxcx\\wxrecode\\node_modules\\wepy\\lib\\event.js":499162500000,"D:\\order\\wxxcx\\wxrecode\\node_modules\\wepy\\lib\\base.js":499162500000,"D:\\order\\wxxcx\\wxrecode\\node_modules\\wepy\\lib\\util.js":499162500000,"D:\\order\\wxxcx\\wxrecode\\node_modules\\wepy\\lib\\mixin.js":499162500000,"D:\\order\\wxxcx\\wxrecode\\node_modules\\wepy-async-function\\global.js":1517302333000,"D:\\order\\wxxcx\\wxrecode\\node_modules\\promise-polyfill\\promise.js":1511627065000,"D:\\order\\wxxcx\\wxrecode\\node_modules\\regenerator-runtime\\runtime.js":1493390741000,"D:\\order\\wxxcx\\wxrecode\\node_modules\\wepy\\lib\\native.js":499162500000}
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/app.wpy
View file
Expand Up @@ -28,7 +28,8 @@ export default class extends wepy.app {
'pages/share/share',
'pages/me/edit',
'pages/weather',
'pages/historytoday'
'pages/historytoday',
'pages/game/index'
// 子页面
],
window: {
Expand Down
Binary file added src/images/timg.gif
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
251 changes: 138 additions & 113 deletions src/pages/expressJump/expressJump.wpy
View file
@@ -1,13 +1,16 @@
<template>
<view class="express">
<view class="title">
<view>{{ expressInfo.logisticCode }}<text wx:if='{{ expressInfo.success }}' class="save" catchtap='save'>保存搜索</text></view>
<view>{{ expressInfo.logisticCode }}
<text wx:if='{{ expressInfo.success }}' class="save" catchtap='save'>保存搜索</text>
</view>
<button open-type='share' class="save save_btn" style="margin-top:80rpx" wx:if='{{ expressInfo.success }}'>分享该单号</button>
</view>
<view class="express-content-wrap">
<view class="content {{ index == 0 ? 'setWrap' : '' }}" wx:for="{{ expressInfo.traces }}" wx:key="unique">
<view class="time" >{{ item.acceptTime}}</view>
<view class="time">{{ item.acceptTime}}</view>
<view class="dot {{ index == 0 ? 'first' : '' }}"></view>
<view class="content-wrap">
<view class="content-wrap">
<view class="site">{{ item.acceptStation }}</view>
<view class="phone iconfont icon-tongxunfei" data-phone="{{ item.phone }}" catchtap="callPhone" wx:if="{{ item.phone }}"></view>
</view>
Expand All @@ -17,105 +20,127 @@
</template>

<script>
import wepy from 'wepy'
import {formatTime } from '@/utils/util'
import wepy from 'wepy';
import { formatTime } from '@/utils/util';

export default class ExpressJump extends wepy.page {
config = {
navigationBarTitleText: '快递查询结果'
}
export default class ExpressJump extends wepy.page {
config = {
navigationBarTitleText: '快递查询结果'
};

data = {
baseUrl: "https://qf-restapi.mdscj.com/xp_express",
getExpressBy100 : "/kuaidi100/query",
number:null,
expressInfo:{}
}

methods = {
callPhone (e) {
wx.makePhoneCall({
phoneNumber: e.currentTarget.dataset.phone
})
},
/**
* 存储记录
*/
save () {
let list = wx.getStorageSync('saveList') || []
let saveSwitch = false;
for (var item in list) {
if (list[item].nubmer === this.number) {
list.splice(item,1)
saveSwitch = true
}
}
let obj = {
nubmer: this.number,
company: this.expressInfo.logisticCode,
traces: this.expressInfo.traces[0]
}
// console.log(obj)
list.unshift(obj)
wx.setStorageSync('saveList', list)
if(saveSwitch){
wx.showModal({
tilte: '已有信息',
content: '亲爱的小主，快递信息已更新',
showCancel: false
})
}else{
wx.showModal({
tilte: '保存成功',
content: '已保存该快递记录',
showCancel: false
})
}
data = {
baseUrl: 'https://qf-restapi.mdscj.com/xp_express',
getExpressBy100: '/kuaidi100/query',
number: null,
expressInfo: {}
};

methods = {
callPhone(e) {
wx.makePhoneCall({
phoneNumber: e.currentTarget.dataset.phone
});
},
/**
* 存储记录
*/
save() {
let list = wx.getStorageSync('saveList') || [];
let saveSwitch = false;
for (var item in list) {
if (list[item].nubmer === this.number) {
list.splice(item, 1);
saveSwitch = true;
}
}
let obj = {
nubmer: this.number,
company: this.expressInfo.logisticCode,
traces: this.expressInfo.traces[0]
};
// console.log(obj)
list.unshift(obj);
wx.setStorageSync('saveList', list);
if (saveSwitch) {
wx.showModal({
tilte: '已有信息',
content: '亲爱的小主，快递信息已更新',
showCancel: false
});
} else {
wx.showModal({
tilte: '保存成功',
content: '已保存该快递记录',
showCancel: false
});
}
},
onShareAppMessage() {
let title = `${this.expressInfo.logisticCode}-单号${this.number}`
return {
title: title,
path: 'pages/expressJump/?number=' + number,
success(res) {
wx.showToast({
title: '分享成功',
icon: 'none'
})
},
fail(res) {
wx.showToast({
title: '分享失败',
icon: 'none'
})
}
};
}
};

onLoad(e) {
let that = this
this.number = e.number
let obj = {
url: this.baseUrl + this.getExpressBy100 + '?logisticsNo=' + e.number,
success (res) {
console.log(res)
if (!res.data.data) {
let obj = {
logisticCode: '请检查您的快递单号',
traces: [{acceptStation: '未查询到该快递单号信息，请检查您的快递单号'}]
}
that.expressInfo = obj
that.$apply()
return
}
var result = res.data.data
var reg = /(\d{11,20})/
for (var item in result.traces) {
let str = result.traces[item].acceptStation
// console.log(str)
let phone = str.match(reg)
// console.log(phone)
if (phone) {
result.traces[item].phone = phone[0]
}
}
console.log(result)
that.expressInfo = result
that.$apply()
}
onLoad(e) {
let that = this;
this.number = e.number;
let obj = {
url: this.baseUrl + this.getExpressBy100 + '?logisticsNo=' + e.number,
success(res) {
console.log(res);
if (!res.data.data) {
let obj = {
logisticCode: '请检查您的快递单号',
traces: [
{ acceptStation: '未查询到该快递单号信息，请检查您的快递单号' }
]
};
that.expressInfo = obj;
that.$apply();
return;
}
wx.request(obj)
}

var result = res.data.data;
var reg = /(\d{11,20})/;
for (var item in result.traces) {
let str = result.traces[item].acceptStation;
// console.log(str)
let phone = str.match(reg);
// console.log(phone)
if (phone) {
result.traces[item].phone = phone[0];
}
}
console.log(result);
that.expressInfo = result;
that.$apply();
}
};
wx.request(obj);
}
}
</script>

<style lang="less" scoped>
.icon-tongxunfei{
color:#138cff
.save_btn:after {
border: none;
}
.icon-tongxunfei {
color: #138cff;
}
.title {
line-height: 160rpx;
Expand All @@ -129,26 +154,26 @@
position: fixed;
top: 20rpx;
right: 20rpx;
border: 2rpx solid #43CD80;
border: 2rpx solid #43cd80;
border-radius: 8rpx;
font-size: 26rpx;
text-align: center;
line-height: 30rpx;
padding: 8rpx;
background-color: #43CD80;
background-color: #43cd80;
z-index: 9999;
color:#fff;
color: #fff;
box-shadow: 2rpx 2rpx 1rpx 0 grey;
}
.content {
font-size: 24rpx;
display: flex;
align-items: center;
margin: 20rpx 0;
.time{
width:140rpx;
text-align:center;
color:#666
.time {
width: 140rpx;
text-align: center;
color: #666;
}
.dot {
position: relative;
Expand Down Expand Up @@ -189,8 +214,8 @@
text-align: left;
.site {
margin-top: 10rpx;
color:#666;
letter-spacing:2rpx;
color: #666;
letter-spacing: 2rpx;
}
.phone {
position: absolute;
Expand All @@ -200,19 +225,19 @@
}
}
}
.setWrap .dot::before {
background-color: #4bff4b;
}
.setWrap .dot::after {
background: linear-gradient(180deg, #4bff4b, #4bff4b, #ccc, #ccc);
.setWrap .dot::before {
background-color: #4bff4b;
}
.setWrap .dot::after {
background: linear-gradient(180deg, #4bff4b, #4bff4b, #ccc, #ccc);
}
.setWrap {
color: #4bff4b;
.time {
color: #4bff4b;
}
.setWrap{
color:#4bff4b;
.time{
color:#4bff4b
}
.content-wrap .site{
color:#4bff4b
}
.content-wrap .site {
color: #4bff4b;
}
}
</style>

0 comments on commit 07d62c9

Please sign in to comment.