Skip to content

F
FuLiMini
Commit 753cc07d by wangjian
Options

Merge branch 'dev'

* dev: (30 commits) 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 修改UI 1 1 1 1 ... # Conflicts: # .gitignore
parents e61cd1b6 0e610af6
Showing with 1286 additions and 260 deletions
.gitignore
/unpackage/
\ No newline at end of file unpackage/
.idea
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
# Generated files
.idea/**/contentModel.xml
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml
.idea/**/libraries
# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr
# CMake
cmake-build-*/
# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# File-based project format
*.iws
# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# Editor-based Rest Client
.idea/httpRequests
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
### Xcode template
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## User settings
xcuserdata/
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/
DerivedData/
*.moved-aside
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
## Gcc Patch
/*.gcno
### Example user template template
### Example user template
# IntelliJ project files
*.iml
out
gen
### Vue template
# gitignore template for Vue.js projects
#
# Recommended template: Node.gitignore
# TODO: where does this rule come from?
docs/_book
# TODO: where does this rule come from?
test/
### Node template
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
# Runtime data
pids
*.pid
*.seed
*.pid.lock
# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
# Coverage directory used by tools like istanbul
coverage
*.lcov
# nyc test coverage
.nyc_output
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# Bower dependency directory (https://bower.io/)
bower_components
# node-waf configuration
.lock-wscript
# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release
# Dependency directories
node_modules/
jspm_packages/
# Snowpack dependency directory (https://snowpack.dev/)
web_modules/
# TypeScript cache
*.tsbuildinfo
# Optional npm cache directory
.npm
# Optional eslint cache
.eslintcache
# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/
# Optional REPL history
.node_repl_history
# Output of 'npm pack'
*.tgz
# Yarn Integrity file
.yarn-integrity
# dotenv environment variables file
.env
.env.test
# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache
# Next.js build output
.next
# Nuxt.js build / generate output
.nuxt
dist
# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public
# vuepress build output
.vuepress/dist
# Serverless directories
.serverless/
# FuseBox cache
.fusebox/
# DynamoDB Local files
.dynamodb/
# TernJS port file
.tern-port
# Stores VSCode versions used for testing VSCode extensions
.vscode-test
# yarn v2
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*
### macOS template
# General
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
common/net.js
...@@ -2,9 +2,9 @@ import store from '../store/index.js'; ...@@ -2,9 +2,9 @@ import store from '../store/index.js';
import router from '../router/router.js' import router from '../router/router.js'
// 测试环境 // 测试环境
const base_url = 'https://sandbox-api-welfare.wasair.com/api.v1/lite' // const base_url = 'https://sandbox-api-welfare.wasair.com/api.v1/lite'
// 正式环境 // 正式环境
// const base_url = 'https://wxlite-api-scm.wasair.com' const base_url = 'https://api-fuli.wasair.com/api.v1/lite'
export function post (url, params) { export function post (url, params) {
let newParams = params || {} let newParams = params || {}
...@@ -17,19 +17,29 @@ export function post (url, params) { ...@@ -17,19 +17,29 @@ export function post (url, params) {
header: headerCom(params), header: headerCom(params),
data: newParams, data: newParams,
success(res) { success(res) {
if (res.data.code == 301 && newParams.refreshToken!=='not') { if (res.data.code == 301) {
tokenSave('') tokenSave('')
store.commit('refreshUserInfo', {}) store.commit('refreshUserInfo', {})
router.push('AlertToLogin', {'message': res.message || '未知错误'}) store.commit('refreshUserLogin', false)
return if (newParams.refreshToken!=='not') {
} router.push('AlertToLogin', {'message': res.data.message || '未知错误'})
if(res.data.code == 302) {
tokenSave(res.data.token)
post(url, params)
return return
} }
let result = res.data }else if(res.data.code == 302) {
// tokenSave(res.data.data.token)
// let pages = getCurrentPages()
// let index = pages.length-1
// uni.redirectTo({
// url: pages[index].$page.fullPath
// })
tokenSave('')
store.commit('refreshUserInfo', {})
store.commit('refreshUserLogin', false)
uni.showToast({
title:'登录信息已失效，请重新登录'
})
} else {
let result = res.data || {}
let tempData = { let tempData = {
"list": [], "list": [],
"paginate": { "paginate": {
...@@ -41,6 +51,7 @@ export function post (url, params) { ...@@ -41,6 +51,7 @@ export function post (url, params) {
} }
result.data = result.data || tempData result.data = result.data || tempData
resolve(result) resolve(result)
}
}, },
fail(err) { fail(err) {
reject(err) reject(err)
...@@ -64,15 +75,25 @@ export function get (url, params) { ...@@ -64,15 +75,25 @@ export function get (url, params) {
if (res.data.code == 301 && newParams.refreshToken!=='not') { if (res.data.code == 301 && newParams.refreshToken!=='not') {
tokenSave('') tokenSave('')
store.commit('refreshUserInfo', {}) store.commit('refreshUserInfo', {})
router.push('AlertToLogin', {'message': res.message || '未知错误'}) store.commit('refreshUserLogin', false)
router.push('AlertToLogin', {'message': res.data.message || '未知错误'})
return return
} }else if(res.data.code == 302) {
if(res.data.code == 302) { // tokenSave(res.data.data.token)
tokenSave(res.data.token) // let pages = getCurrentPages()
post(url, params) // let index = pages.length-1
return // uni.redirectTo({
} // url: pages[index].$page.fullPath
// })
tokenSave('')
store.commit('refreshUserInfo', {})
store.commit('refreshUserLogin', false)
uni.showToast({
title:'登录信息已失效，请重新登录'
})
} else {
resolve(res.data) resolve(res.data)
}
}, },
fail(err) { fail(err) {
reject(err) reject(err)
......
components/AlertRecover/AlertRecover.vue
<template> <template>
<view class="container"> <view class="container">
<view class="content"> <view class="content">
<image class="close" src="../../static/close-gray.png" mode="" @click="close()"></image> <image class="close" src="@/static/close-w.png" mode="" @click="close()"></image>
<view class="top"> <view class="top">
<view class="title">卡券回收</view> <view class="title">卡券回收</view>
</view> </view>
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
<view class="title">卡片回收方法如下：</view> <view class="title">卡片回收方法如下：</view>
<view class="first">1.点击下方“确认回收”按钮，进入58同城小程序。</view> <view class="first">1.点击下方“确认回收”按钮，进入58同城小程序。</view>
<view class="second">2.在58同城小程序的搜索框中输入“卡券”进行搜索,如下图：</view> <view class="second">2.在58同城小程序的搜索框中输入“卡券”进行搜索,如下图：</view>
<image class="third" src="../../static/recover-1.png" mode=""></image> <image class="third" src="https://static-walfare.wasair.com/goods/2022/04/27/f2d5fa585896d784551b8a3131eb6b34.png" mode=""></image>
<view class="four">3.在搜索结果中联系商家即可上门回收，如下图：</view> <view class="four">3.在搜索结果中联系商家即可上门回收，如下图：</view>
<image class="five" src="../../static/recover-2.png" mode=""></image> <image class="five" src="https://static-walfare.wasair.com/goods/2022/04/27/312c0872780557824aeb2d104ab3fd43.png" mode=""></image>
</view> </view>
<view class="buy-bottom" @click="goMini()">确认回收</view> <view class="buy-bottom" @click="goMini()">确认回收</view>
</view> </view>
...@@ -64,6 +64,8 @@ ...@@ -64,6 +64,8 @@
.content { .content {
margin: 50% 55rpx; margin: 50% 55rpx;
border-radius: 16rpx; border-radius: 16rpx;
border-top-left-radius: 100rpx;
border-top-right-radius: 100rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
// width: 640rpx; // width: 640rpx;
height: 1018rpx; height: 1018rpx;
......
components/AlertSelectStatus/AlertSelectStatus.vue
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
background-color: rgba($color: #000000, $alpha: 0.7); background-color: rgba($color: #000000, $alpha: 0.7);
z-index: 99999; z-index: 99999;
.content { .content {
margin: 50% 55rpx; margin: 80% 55rpx;
border-radius: 16rpx; border-radius: 16rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 48rpx 40rpx; padding: 48rpx 40rpx;
...@@ -104,7 +104,6 @@ ...@@ -104,7 +104,6 @@
color: #FFFFFF; color: #FFFFFF;
font-size: 32rpx; font-size: 32rpx;
z-index: 99999; z-index: 99999;
margin-bottom: 32rpx;
} }
} }
} }
......
components/AlertUnlock/AlertUnlock.vue
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
background-color: rgba($color: #000000, $alpha: 0.7); background-color: rgba($color: #000000, $alpha: 0.7);
z-index: 99999; z-index: 99999;
.content { .content {
margin: 50% 55rpx; margin: 80% 55rpx 40%;
border-radius: 16rpx; border-radius: 16rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 48rpx 40rpx; padding: 48rpx 40rpx;
...@@ -86,7 +86,6 @@ ...@@ -86,7 +86,6 @@
color: #FFFFFF; color: #FFFFFF;
font-size: 32rpx; font-size: 32rpx;
z-index: 99999; z-index: 99999;
margin-bottom: 32rpx;
} }
} }
} }
......
components/goodsSelect/goodsSelect.vue
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
}, },
add() { add() {
if (this.$numUtils.numMulti(this.selectSkuIntegral, this.goodsNum+1) > Number(this.$store.state.userInfo.surplusIntegral)) { if (this.$numUtils.numMulti(this.selectSkuIntegral, this.goodsNum+1) > Number(this.$store.state.userInfo.surplusIntegral)) {
this.toast('积分不够') this.toast('积分不足')
return return
} }
this.goodsNum++ this.goodsNum++
......
components/pwdCodeAlert/pwdCodeAlert.vue
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
return return
} }
this.$emit('pwdSubmit', this.pwd) this.$emit('pwdSubmit', this.pwd)
this.close()
}, },
close() { close() {
this.pwd = '' this.pwd = ''
...@@ -106,7 +105,7 @@ ...@@ -106,7 +105,7 @@
} }
} }
.buy-bottom { .buy-bottom {
margin-top: 96rpx; margin-top: 64rpx;
border-radius: 40rpx; border-radius: 40rpx;
height: 80rpx; height: 80rpx;
width: 560rpx; width: 560rpx;
...@@ -116,7 +115,6 @@ ...@@ -116,7 +115,6 @@
color: #FFFFFF; color: #FFFFFF;
font-size: 32rpx; font-size: 32rpx;
z-index: 99999; z-index: 99999;
margin-bottom: 32rpx;
} }
} }
} }
......
components/setPwdAlert/setPwdAlert.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<image class="eye" @click="clickEye(2)" :src="secondOpen?'../../static/eye-open.png':'../../static/eye-off.png'" mode=""></image> <image class="eye" @click="clickEye(2)" :src="secondOpen?'../../static/eye-open.png':'../../static/eye-off.png'" mode=""></image>
</view> </view>
</view> </view>
<view @click="submit()" class="buy-bottom" :style="{'background-color':firstPwd===secondPwd&&secondPwd!=''?'#FF0520':''}">确认支付密码</view> <view @click="submit()" class="buy-bottom" :style="{'background-color':firstPwd===secondPwd&&secondPwd!=''?'#FF0520':''}">确认</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
background-color: rgba($color: #000000, $alpha: 0.7); background-color: rgba($color: #000000, $alpha: 0.7);
z-index: 99999; z-index: 99999;
.content { .content {
margin: 50% 28rpx; margin: 40% 56rpx 60%;
border-radius: 16rpx; border-radius: 16rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 48rpx 40rpx; padding: 48rpx 40rpx;
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
} }
} }
.buy-bottom { .buy-bottom {
margin: 64rpx 0 48rpx; margin: 64rpx 0 0;
border-radius: 40rpx; border-radius: 40rpx;
height: 80rpx; height: 80rpx;
background-color: #FF0520; background-color: #FF0520;
......
components/smsCodeAlert/smsCodeAlert.vue
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
<validCode ref="code" :maxlength="4" @finish="getPwd" @inputChange="inputChange"></validCode> <validCode ref="code" :maxlength="4" @finish="getPwd" @inputChange="inputChange"></validCode>
</view> </view>
<view @click="submit()" class="buy-bottom" :style="{'background-color':btnActive?'#FF0520':''}">确认</view> <view @click="submit()" class="buy-bottom" :style="{'background-color':btnActive?'#FF0520':''}">确认</view>
<view @click="sendCode()" class="re-send" :style="{'color':isSendCode?'#999999':'#FF0520'}">
{{btnText}}
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -20,7 +23,10 @@ ...@@ -20,7 +23,10 @@
data() { data() {
return { return {
phone: this.$store.state.userInfo.mobile, phone: this.$store.state.userInfo.mobile,
code: '' code: '',
btnText: '重新发送',
isSendCode: false,
time: 60
}; };
}, },
props: { props: {
...@@ -49,13 +55,48 @@ ...@@ -49,13 +55,48 @@
return return
} }
this.$emit('smsCodeSubmit', this.code) this.$emit('smsCodeSubmit', this.code)
this.close()
}, },
close() { close() {
this.code = '' this.code = ''
this.$refs.code.clear() this.$refs.code.clear()
this.$parent[this.closeName] = false this.$parent[this.closeName] = false
},
sendCode() {
if (this.time != 60) {
return
} }
let params = {'codeType': '120', 'mobile': this.phone, 'resetToken':'not'}
this.$net.post('/staff/sms', params).then(res => {
if (res.code === 200) {
uni.showToast({
title: '验证码发送成功'
})
this.startTime()
} else {
uni.showToast({
title: res.message
})
}
})
},
startTime () {
if (this.time != 60) {
return
}
this.isSendCode = true
this.btnText = '重新发送（'+this.time+'s）'
var timer = setInterval(()=>{
this.time--
if (this.time>0) {
this.btnText = '重新发送（'+this.time+'s）'
} else {
this.btnText = '重新发送'
this.time = 60
this.isSendCode = false
clearInterval(timer)
}
}, 1000)
},
}, },
watch: { watch: {
firstOpen(newVal, oldVal) { firstOpen(newVal, oldVal) {
...@@ -122,6 +163,11 @@ ...@@ -122,6 +163,11 @@
z-index: 99999; z-index: 99999;
margin-bottom: 32rpx; margin-bottom: 32rpx;
} }
.re-send {
text-align: center;
font-size: 28rpx;
color: #999999;
}
} }
} }
</style> </style>
components/validCode/validCode.vue
...@@ -10,14 +10,6 @@ isPwd：是否是密码模式 ...@@ -10,14 +10,6 @@ isPwd：是否是密码模式
<template> <template>
<view class="code-area"> <view class="code-area">
<view class="flex-box"> <view class="flex-box">
<input
:value="val"
type="number"
focus="true"
:maxlength="maxlength"
class="hide-input"
@input="getVal"
/>
<view v-bind:class="['item', { active: codeIndex == 1, 'code-item': !isPwd}]"> <view v-bind:class="['item', { active: codeIndex == 1, 'code-item': !isPwd}]">
<view class="line"></view> <view class="line"></view>
<block v-if="isPwd && codeArr.length >= 1"> <block v-if="isPwd && codeArr.length >= 1">
...@@ -62,8 +54,15 @@ isPwd：是否是密码模式 ...@@ -62,8 +54,15 @@ isPwd：是否是密码模式
<block v-else> {{ codeArr[5] ? codeArr[5] : ''}}</block> <block v-else> {{ codeArr[5] ? codeArr[5] : ''}}</block>
</view> </view>
</block> </block>
<input
:value="val"
type="number"
focus
auto-focus="true"
:maxlength="maxlength"
class="hide-input"
@input="getVal"
/>
</view> </view>
</view> </view>
</template> </template>
...@@ -172,8 +171,9 @@ export default { ...@@ -172,8 +171,9 @@ export default {
width: 200%; width: 200%;
height: 100%; height: 100%;
text-align: left; text-align: left;
z-index: 9; z-index: 99999999;
opacity: 1; opacity: 1;
color: #333333;
} }
@keyframes twinkling { @keyframes twinkling {
......
pages.json
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
"style" : "style" :
{ {
"navigationBarTitleText": "懒人企业福利社", "navigationBarTitleText": "懒人企业福利社",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
} }
} }
,{ ,{
...@@ -13,7 +14,8 @@ ...@@ -13,7 +14,8 @@
"style" : "style" :
{ {
"navigationBarTitleText": "订单", "navigationBarTitleText": "订单",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
} }
} }
...@@ -24,7 +26,9 @@ ...@@ -24,7 +26,9 @@
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom", "navigationStyle": "custom",
"backgroundColor":"#F5F5F5" "backgroundColor":"#F5F5F5",
"navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "white"
} }
} }
...@@ -36,14 +40,16 @@ ...@@ -36,14 +40,16 @@
"path": "login/login", "path": "login/login",
"style": { "style": {
"navigationBarTitleText": "登录", "navigationBarTitleText": "登录",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
} }
},{ },{
"path" : "integral/integral", "path" : "integral/integral",
"style" : "style" :
{ {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
} }
} }
...@@ -52,7 +58,8 @@ ...@@ -52,7 +58,8 @@
"style" : "style" :
{ {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
} }
} }
...@@ -61,7 +68,8 @@ ...@@ -61,7 +68,8 @@
"style" : "style" :
{ {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
} }
} }
...@@ -78,42 +86,49 @@ ...@@ -78,42 +86,49 @@
"path": "GoodSkuList/GoodSkuList", "path": "GoodSkuList/GoodSkuList",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
} }
}, { }, {
"path": "integralDetail/integralDetail", "path": "integralDetail/integralDetail",
"style": { "style": {
"navigationBarTitleText": "积分明细", "navigationBarTitleText": "积分明细",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
} }
}, { }, {
"path": "setting/setting", "path": "setting/setting",
"style": { "style": {
"navigationBarTitleText": "设置", "navigationBarTitleText": "设置",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
} }
}, { }, {
"path": "VertifyPhone/VertifyPhone", "path": "VertifyPhone/VertifyPhone",
"style": { "style": {
"navigationBarTitleText": "验证手机号", "navigationBarTitleText": "验证手机号",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
} }
}, { }, {
"path": "SetPwd/SetPwd", "path": "SetPwd/SetPwd",
"style": { "style": {
"navigationBarTitleText": "设置支付密码", "navigationBarTitleText": "设置支付密码",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
} }
}, { }, {
"path": "orderDetail/orderDetail", "path": "orderDetail/orderDetail",
"style": { "style": {
"navigationBarTitleText": "订单详情", "navigationBarTitleText": "订单详情",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle":"custom" "navigationStyle":"custom",
"navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "white"
} }
} }
,{ ,{
...@@ -122,7 +137,9 @@ ...@@ -122,7 +137,9 @@
{ {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle":"custom" "navigationStyle":"custom",
"navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "white"
} }
} }
...@@ -132,7 +149,28 @@ ...@@ -132,7 +149,28 @@
{ {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom" "navigationStyle": "custom",
"navigationBarBackgroundColor": "#FFFFFF"
}
}
,{
"path" : "agreement/agreement",
"style" :
{
"navigationBarTitleText": "隐私协议",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}
,{
"path" : "webView/webView",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
} }
} }
......
pages/mine/mine.vue
...@@ -84,7 +84,6 @@ ...@@ -84,7 +84,6 @@
onShow() { onShow() {
this.userInfo = {} this.userInfo = {}
this.getUserInfo() this.getUserInfo()
console.log(this.$store.state);
if (this.$store.state.selectAccount) { if (this.$store.state.selectAccount) {
this.$store.commit('refreshSelectAccount', false) this.$store.commit('refreshSelectAccount', false)
this.toast('账号切换成功') this.toast('账号切换成功')
...@@ -170,7 +169,7 @@ ...@@ -170,7 +169,7 @@
} else if (index === 2) { } else if (index === 2) {
this.$router.push('IntegralDetail') this.$router.push('IntegralDetail')
} else if (index === 3) { } else if (index === 3) {
this.$router.push('WebView')
} }
}, },
setting() { setting() {
...@@ -241,10 +240,10 @@ ...@@ -241,10 +240,10 @@
margin-left: 30rpx; margin-left: 30rpx;
height: 110rpx; height: 110rpx;
width: 110rpx; width: 110rpx;
border-radius: 110rpx; border-radius: 55rpx;
} }
.info { .info {
margin-top: 50rpx; margin-top: 44rpx;
margin-left: 20rpx; margin-left: 20rpx;
width: 380rpx; width: 380rpx;
.name { .name {
...@@ -256,7 +255,7 @@ ...@@ -256,7 +255,7 @@
overflow: hidden; overflow: hidden;
} }
.shop { .shop {
margin-top: 20rpx; margin-top: 14rpx;
font-size: 24rpx; font-size: 24rpx;
color: #999999; color: #999999;
white-space: nowrap; white-space: nowrap;
...@@ -285,13 +284,14 @@ ...@@ -285,13 +284,14 @@
} }
} }
.user-integral { .user-integral {
margin: 0 70rpx; margin: 0 35rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-top: 2rpx solid #F5F5F5; border-top: 2rpx solid #F5F5F5;
.item { .item {
text-align: center; text-align: center;
margin-top: 34rpx; margin-top: 34rpx;
flex: 1;
.num { .num {
font-size: 36rpx; font-size: 36rpx;
color: #333333; color: #333333;
...@@ -315,7 +315,8 @@ ...@@ -315,7 +315,8 @@
} }
.item { .item {
display: flex; display: flex;
padding: 26rpx 30rpx; padding: 26rpx 0;
margin: 0 30rpx;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
border-bottom: 2rpx solid#F5F5F5; border-bottom: 2rpx solid#F5F5F5;
......
pages/order/order.vue
<template> <template>
<view class="container"> <view class="container">
<view class="empty" v-if="orderLists.length<=0 && loadingType != 'loading'"> <view class="empty" v-if="orderLists.length<=0 && loadingType != 'loading'">
<image class="empty-img" src="../../static/empty-coupon.png" mode=""></image> <image class="empty-img" src="../../static/integral-empty-icon.png" mode=""></image>
<view class="empty-text">暂无订单</view> <view class="empty-text">暂无订单</view>
</view> </view>
<view class="order-list"> <view class="order-list">
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
</view> </view>
</view> </view>
</view> </view>
<!-- <view class="line" v-if="item.state === 200"></view> -->
<view class="btn" v-if="item.state === 200"> <view class="btn" v-if="item.state === 200">
<view class="btn-item pay-btn" @click.stop="goCoupon(item)"> <view class="btn-item pay-btn" @click.stop="goCoupon(item)">
查看卡券 查看卡券
...@@ -50,21 +51,29 @@ ...@@ -50,21 +51,29 @@
statusText:{ statusText:{
100:'待兑换',200:'兑换成功',300:'兑换失败' 100:'待兑换',200:'兑换成功',300:'兑换失败'
}, },
page: 1 page: 1,
isLogin: true
}; };
}, },
onLoad() { onLoad() {
}, },
onPullDownRefresh () {
console.log('下拉刷新');
},
onReachBottom () { onReachBottom () {
this.getList() this.getList()
}, },
onShow() {
this.isLogin = this.$store.state.isLogin
},
onTabItemTap () { onTabItemTap () {
if (!this.$store.state.isLogin) { if (!this.$store.state.isLogin) {
this.$router.push('Login') this.$router.push('Login')
return
} }
this.orderLists = [] this.orderLists = []
this.page = 1 this.page = 1
this.loadingType = 'more' this.loadingType = 'loading'
this.getList() this.getList()
}, },
methods: { methods: {
...@@ -85,6 +94,7 @@ ...@@ -85,6 +94,7 @@
this.page++ this.page++
} }
} else { } else {
this.loadingType = 'noMore'
this.toast(res.message) this.toast(res.message)
} }
}) })
...@@ -93,7 +103,21 @@ ...@@ -93,7 +103,21 @@
this.$router.push('OrderDetail',{'orderId':item.orderSn}) this.$router.push('OrderDetail',{'orderId':item.orderSn})
}, },
goCoupon(item) { goCoupon(item) {
this.$router.push('Coupon', {'orderId':item.orderSn}) this.$router.push('Coupon', {'orderId':item.orderSn, 'cardIsAllUnlock': item.cardIsAllUnlock})
}
},
watch: {
isLogin(newVal, oldVal) {
console.log(newVal, oldVal);
if (!oldVal && newVal) {
this.orderLists = []
this.page = 1
this.loadingType = 'loading'
this.getList()
}
if (oldVal && !newVal) {
this.orderLists = []
}
} }
} }
} }
...@@ -170,12 +194,19 @@ ...@@ -170,12 +194,19 @@
} }
} }
} }
.line {
margin-top: 32rpx;
height: 2rpx;
width: 100%;
background-color: #F5F5F5;
content: ' ';
}
.btn { .btn {
width: 654rpx; width: 654rpx;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
.btn-item { .btn-item {
margin-top: 40rpx; margin-top: 32rpx;
height: 62rpx; height: 62rpx;
width: 176rpx; width: 176rpx;
border-radius: 32rpx; border-radius: 32rpx;
...@@ -196,10 +227,12 @@ ...@@ -196,10 +227,12 @@
} }
} }
.empty { .empty {
padding: 432rpx 136rpx 0; padding: 400rpx 136rpx 0;
text-align: center;
.empty-img { .empty-img {
height: 280rpx; margin: 0 auto;
width: 480rpx; height: 300rpx;
width: 394rpx;
} }
.empty-text { .empty-text {
font-size: 28rpx; font-size: 28rpx;
......
pagesA/GoodSkuList/GoodSkuList.vue
...@@ -37,6 +37,7 @@ export default { ...@@ -37,6 +37,7 @@ export default {
this.$net this.$net
.get('/goods/sku', { page: this.page, pageSize: this.pageSize, brandNo: this.brandNo }) .get('/goods/sku', { page: this.page, pageSize: this.pageSize, brandNo: this.brandNo })
.then(res => { .then(res => {
console.log(res);
if (res.data.list.length > 0) { if (res.data.list.length > 0) {
this.goodList = this.goodList this.goodList = this.goodList
.concat(res.data.list); .concat(res.data.list);
...@@ -55,6 +56,12 @@ export default { ...@@ -55,6 +56,12 @@ export default {
}; };
</script> </script>
<style>
page{
background-color: #f5f5f5;
}
</style>
<style lang="scss" scoped> <style lang="scss" scoped>
.layout { .layout {
width: 100%; width: 100%;
...@@ -63,14 +70,14 @@ export default { ...@@ -63,14 +70,14 @@ export default {
.list { .list {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 6rpx 12rpx; padding: 0 24rpx;
.item { .item {
display: flex; display: flex;
flex-direction: row; // align-items: center;
background: #ffffff; background: #ffffff;
padding: 20rpx 20rpx; padding: 24rpx;
border-radius: 16rpx; border-radius: 16rpx;
margin: 12rpx 0; margin-top: 24rpx;
.img { .img {
width: 200rpx; width: 200rpx;
height: 200rpx; height: 200rpx;
...@@ -84,8 +91,8 @@ export default { ...@@ -84,8 +91,8 @@ export default {
.item-title { .item-title {
font-size: 28rpx; font-size: 28rpx;
color: #333333; color: #333333;
height: 58rpx; height: 80rpx;
line-height: 28rpx; line-height: 40rpx;
overflow: hidden; overflow: hidden;
min-inline-size: 2; min-inline-size: 2;
line-clamp: 2; line-clamp: 2;
...@@ -95,7 +102,7 @@ export default { ...@@ -95,7 +102,7 @@ export default {
.item-brand { .item-brand {
background: rgba(255, 5, 32, 0.03); background: rgba(255, 5, 32, 0.03);
border-radius: 4rpx; border-radius: 4rpx;
border: 1rpx solid #ff0520; border: 2rpx solid #ff0520;
font-size: 22rpx; font-size: 22rpx;
color: #ff0520; color: #ff0520;
margin-top: 12rpx; margin-top: 12rpx;
......
pagesA/VertifyPhone/VertifyPhone.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<view class="first-line">请完成以下认证</view> <view class="first-line">请完成以下认证</view>
<view class="sencond-line">请输入{{ phone }}收到的短信验证码</view> <view class="sencond-line">请输入{{ phone }}收到的短信验证码</view>
<view class="code-layout"> <view class="code-layout">
<input class="input" placeholder="请输入短信验证码" v-model="code" type="number" maxlength="8" /> <input class="input" placeholder="请输入短信验证码" placeholder-style="color:#999999;font-weight:400" v-model="code" type="number" maxlength="8" />
<text class="vertify-code" @click="getCode()">{{ verifyCode }}</text> <text class="vertify-code" @click="getCode()">{{ verifyCode }}</text>
</view> </view>
<view :class="code.length > 0 ? 'submit1' : 'submit'" @click="submit">下一步</view> <view :class="code.length > 0 ? 'submit1' : 'submit'" @click="submit">下一步</view>
...@@ -91,21 +91,19 @@ export default { ...@@ -91,21 +91,19 @@ export default {
font-size: 36rpx; font-size: 36rpx;
font-weight: bolder; font-weight: bolder;
color: #333333; color: #333333;
line-height: 48rpx;
margin: 80rpx 49rpx 0 49rpx; margin: 80rpx 49rpx 0 49rpx;
} }
.sencond-line { .sencond-line {
font-size: 26rpx; font-size: 26rpx;
color: #333333; color: #333333;
line-height: 48rpx; margin: 24rpx 49rpx 0 49rpx;
margin: 29rpx 49rpx 0 49rpx;
} }
.code-layout { .code-layout {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin: 29rpx 49rpx 0 49rpx; margin: 119rpx 49rpx 0 49rpx;
border-bottom: solid 2rpx #ff0520; border-bottom: solid 2rpx #ff0520;
padding-bottom: 30rpx; padding-bottom: 30rpx;
.input { .input {
......
pagesA/coupon/coupon.vue
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
<image v-if="isExpired(item)" class="expired" src="../../static/expired.png" mode=""></image> <image v-if="isExpired(item)" class="expired" src="../../static/expired.png" mode=""></image>
<view class="goods-info"> <view class="goods-info">
<image v-if="!isExpired(item)" class="bg-img" src="../../static/coupon-top-h.png" mode=""></image> <image v-if="!isExpired(item)" class="bg-img" src="../../static/coupon-top-h.png" mode=""></image>
<image v-if="isExpired(item)" class="bg-img" src="../../static/coupon-top-gray.png" mode=""></image> <view v-if="isExpired(item)" class="bg-img"></view>
<view class="left"> <view class="left">
<image class="img" :src="item.brandImg" mode=""></image> <image class="img" :style="{'opacity':isExpired(item)?'0.5':''}" :src="item.brandImg" mode=""></image>
<view class="info"> <view class="info">
<view class="name">{{item.brandName}}</view> <view class="name">{{item.brandName}}</view>
<view class="spec">{{item.attrName}}:{{item.denomination}}</view> <view class="spec">{{item.attrName}}:{{item.denomination}}</view>
...@@ -103,6 +103,7 @@ ...@@ -103,6 +103,7 @@
}, },
onLoad(options) { onLoad(options) {
this.orderId = options.orderId this.orderId = options.orderId
this.type = options.cardIsAllUnlock == 10 ? 200 : 100
this.getCouponData() this.getCouponData()
this.getList() this.getList()
}, },
...@@ -395,6 +396,7 @@ ...@@ -395,6 +396,7 @@
margin-right: 16rpx; margin-right: 16rpx;
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
flex-shrink: 0;
} }
.coupon-big { .coupon-big {
flex: 1; flex: 1;
...@@ -412,6 +414,9 @@ ...@@ -412,6 +414,9 @@
width: 100%; width: 100%;
height: 120rpx; height: 120rpx;
z-index: -1; z-index: -1;
background-color: #999999;
border-top-left-radius: 16rpx;
border-top-right-radius: 16rpx;
} }
.left { .left {
display: flex; display: flex;
...@@ -509,14 +514,15 @@ ...@@ -509,14 +514,15 @@
} }
.empty { .empty {
padding: 100rpx 136rpx 0; padding: 100rpx 136rpx 0;
text-align: center;
.empty-img { .empty-img {
height: 280rpx; height: 300rpx;
width: 480rpx; width: 394rpx;
} }
.empty-text { .empty-text {
font-size: 28rpx; font-size: 28rpx;
color: #BFBFBF; color: #BFBFBF;
margin-top: 48rpx; margin-top: 24rpx;
width: 480rpx; width: 480rpx;
text-align: center; text-align: center;
} }
......
pagesA/goods/goods.vue
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
<!--商品属性--> <!--商品属性-->
<view class="good-attr"> <view class="good-attr">
<view class="good-attr-rule" @click="showSkuDialog" > <view class="good-attr-rule" @click="showSkuDialog" >
<text class="attr-name">已选</text> <text class="attr-name">已&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;选</text>
<text>:</text> <text>:</text>
<text class="attrs">{{goods.skuDetail.denomination}}</text> <text class="attrs">{{goods.skuDetail.denomination}}</text>
<image class="right-row" src="../../static/arrow-right.png"></image> <image class="right-row" src="../../static/arrow-right.png"></image>
</view> </view>
<view class="good-attr-rule"> <view class="good-attr-rule" style="border: none;">
<text class="attr-name">购买限制</text> <text class="attr-name">购买限制</text>
<text>:</text> <text>:</text>
<text class="attrs">{{goods.skuDetail.validityType}}</text> <text class="attrs">{{goods.skuDetail.validityType}}</text>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
return newContent; return newContent;
}, },
clickCustomer () { clickCustomer () {
this.$wxCustomer() this.$router.push('WebView')
}, },
goSubmit (e) { goSubmit (e) {
if (!this.$store.state.isLogin) { if (!this.$store.state.isLogin) {
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
display: flex; display: flex;
.goods-info-left { .goods-info-left {
width: 606rpx; width: 606rpx;
padding-top: 8rpx; // padding-top: 8rpx;
.good-price-share { .good-price-share {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
.good-title { .good-title {
font-size: 30upx; font-size: 30upx;
font-weight: bolder; font-weight: bolder;
line-height: 48upx; line-height: 42upx;
margin-top: 10upx; margin-top: 10upx;
max-lines: 3; max-lines: 3;
line-clamp: 3; line-clamp: 3;
...@@ -394,11 +394,22 @@ ...@@ -394,11 +394,22 @@
align-items: center; align-items: center;
.attr-name { .attr-name {
font-size: 28upx; font-size: 28upx;
color: #848689; color: #333333;
line-height: 40upx; line-height: 40upx;
white-space: nowrap; white-space: nowrap;
width: 120rpx; width: 120rpx;
text-align-last: justify; // text-align-last: justify;
// -webkit-text-align-last: justify;
text-align: justify;
text-align-last: center;
-moz-text-align-last: center;
}
.attr-name::after {
content: ' ';
width: 100%;
height: 0;
display: inline-block;
visibility: hidden;
} }
.attr-name-icon { .attr-name-icon {
font-size: 28upx; font-size: 28upx;
...@@ -413,7 +424,7 @@ ...@@ -413,7 +424,7 @@
} }
.right-row { .right-row {
width: 12upx; width: 12upx;
height: 24upx; height: 20upx;
position: absolute; position: absolute;
right: 48upx; right: 48upx;
} }
......
pagesA/integralDetail/integralDetail.vue
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<uni-load-more v-if="integralList.length > 0" :status="loadingType"></uni-load-more> <uni-load-more v-if="integralList.length > 0" :status="loadingType"></uni-load-more>
</view> </view>
<view v-else-if="!isLoading && integralList.length <= 0" class="empty"> <view v-else-if="!isLoading && integralList.length <= 0" class="empty">
<image class="empty-icon" src="../../static/integral-empty-icon.png"></image> <image class="empty-icon" src="@/static/integral-empty-icon.png"></image>
<text class="empty-desc">本月暂时没有支出积分哦</text> <text class="empty-desc">本月暂时没有支出积分哦</text>
</view> </view>
<uni-popup class="pop" ref="timeShow" type="bottom" background-color="#fff" safeArea="true"> <uni-popup class="pop" ref="timeShow" type="bottom" background-color="#fff" safeArea="true">
...@@ -105,10 +105,10 @@ export default { ...@@ -105,10 +105,10 @@ export default {
.post('/integral/index', { page: this.page, pageSize: this.pageSize, applyDate: this.applyDate, type: this.currentTab }) .post('/integral/index', { page: this.page, pageSize: this.pageSize, applyDate: this.applyDate, type: this.currentTab })
.then(res => { .then(res => {
this.applyDate = res.data.applyDate; this.applyDate = res.data.applyDate;
this.allConsume = res.data.allConsume.length>0?res.data.allConsume:'0.00';
this.allIncome = res.data.allIncome.length>0?res.data.allIncome:'0.00';
if (res.data.list.length > 0) { if (res.data.list.length > 0) {
this.integralList = this.integralList.concat(res.data.list); this.integralList = this.integralList.concat(res.data.list);
this.allConsume = res.data.allConsume;
this.allIncome = res.data.allIncome;
this.page += 1; this.page += 1;
} }
this.loadingType = res.data.list.length < this.pageSize ? 'noMore' : 'more'; this.loadingType = res.data.list.length < this.pageSize ? 'noMore' : 'more';
...@@ -217,7 +217,7 @@ export default { ...@@ -217,7 +217,7 @@ export default {
width: 90rpx; width: 90rpx;
height: 90rpx; height: 90rpx;
background: #ffffff; background: #ffffff;
border: 2px solid #efefef; border: 2rpx solid #efefef;
border-radius: 50%; border-radius: 50%;
margin-left: 30rpx; margin-left: 30rpx;
} }
......
pagesA/login/login.vue
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
if (this.time != 300) { if (this.time != 300) {
return return
} }
let params = {'codeType': '10', 'codeType': this.phone, 'resetToken':'not'} let params = {'codeType': '10', 'mobile': this.phone, 'resetToken':'not'}
this.$net.post('/meta/sms', params).then(res => { this.$net.post('/meta/sms', params).then(res => {
if (res.code === 200) { if (res.code === 200) {
uni.showToast({ uni.showToast({
...@@ -244,13 +244,13 @@ ...@@ -244,13 +244,13 @@
.login-btn { .login-btn {
margin: 80rpx auto 0; margin: 80rpx auto 0;
background-color: #ff0520; background-color: #ff0520;
height: 80rpx; height: 96rpx;
width: 590rpx; width: 590rpx;
line-height: 82rpx; line-height: 98rpx;
font-size: 32rpx; font-size: 32rpx;
color: #ffffff; color: #ffffff;
text-align: center; text-align: center;
border-radius: 40rpx; border-radius: 48rpx;
} }
} }
</style> </style>
pagesA/orderDetail/orderDetail.vue
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
if (this.orderData.state === 100) { if (this.orderData.state === 100) {
this.toast('卡券生成中，请稍候…') this.toast('卡券生成中，请稍候…')
} else if (this.orderData.state === 200) { } else if (this.orderData.state === 200) {
this.$router.push('Coupon', {'orderId':this.orderData.orderSn}) this.$router.push('Coupon', {'orderId':this.orderData.orderSn, 'cardIsAllUnlock': this.orderData.cardIsAllUnlock})
} else { } else {
this.toast('兑换失败，无法查看') this.toast('兑换失败，无法查看')
} }
...@@ -196,7 +196,6 @@ ...@@ -196,7 +196,6 @@
top: 0; top: 0;
left: 0; left: 0;
right: 0; right: 0;
background-color: #FF0520;
align-items: center; align-items: center;
.back { .back {
padding: 0 34rpx; padding: 0 34rpx;
...@@ -243,7 +242,7 @@ ...@@ -243,7 +242,7 @@
.goods { .goods {
border-radius: 16rpx; border-radius: 16rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
margin-bottom: 24rpx; // margin-bottom: 24rpx;
padding: 32rpx 24rpx; padding: 32rpx 24rpx;
display: flex; display: flex;
padding: 24rpx; padding: 24rpx;
...@@ -351,6 +350,7 @@ ...@@ -351,6 +350,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-top: 40rpx;
view { view {
font-size: 26rpx; font-size: 26rpx;
color: #999999; color: #999999;
...@@ -378,7 +378,7 @@ ...@@ -378,7 +378,7 @@
.coupon-btn { .coupon-btn {
// height: 120rpx; // height: 120rpx;
bottom: 0; bottom: 0;
background-color: #FFFFFF; background-color: transparent;
display: flex; display: flex;
padding: 0 24rpx; padding: 0 24rpx;
// align-items: center; // align-items: center;
...@@ -387,7 +387,7 @@ ...@@ -387,7 +387,7 @@
left: 0; left: 0;
right: 0; right: 0;
.btn { .btn {
background-color: rgba($color: #FF0520, $alpha: 0.5); background-color: #F97D8B;
border-radius: 40rpx; border-radius: 40rpx;
height: 80rpx; height: 80rpx;
width: 100%; width: 100%;
......
pagesA/selectAccount/selectAccount.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<image v-if="!selectTips" class="select-img" src="../../static/select-n.png" mode="" @click="selectTips=!selectTips"></image> <image v-if="!selectTips" class="select-img" src="../../static/select-n.png" mode="" @click="selectTips=!selectTips"></image>
<image v-else class="select-img" src="../../static/select-h.png" mode="" @click="selectTips=false"></image> <image v-else class="select-img" src="../../static/select-h.png" mode="" @click="selectTips=false"></image>
<view class="tips"> <view class="tips">
查看并同意<text>《隐私政策》</text>和<text>《服务协议》</text> 我已阅读并同意使用<text @click="$router.push('Agreement')">《用户隐私协议》</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
methods: { methods: {
goAccount(item) { goAccount(item) {
if (!this.selectTips && !this.isSettingEnter) { if (!this.selectTips && !this.isSettingEnter) {
this.toast('请先查看并同意《隐私政策》和《服务协议》') this.toast('请先查看并同意《用户隐私协议》')
return return
} }
if (item.staffState!==200) { if (item.staffState!==200) {
...@@ -86,15 +86,18 @@ ...@@ -86,15 +86,18 @@
padding: 64rpx; padding: 64rpx;
.top { .top {
font-size: 40rpx; font-size: 40rpx;
font-weight: bolder;
line-height: 56rpx;
color: #333333; color: #333333;
} }
.sub { .sub {
font-size: 24rpx; font-size: 24rpx;
line-height: 34rpx;
color: #666666; color: #666666;
margin-top: 16rpx; margin-top: 16rpx;
} }
.account-content { .account-content {
height: 550rpx; height: 570rpx;
overflow-y: auto; overflow-y: auto;
margin-top: 128rpx; margin-top: 128rpx;
.first-item{ .first-item{
...@@ -111,7 +114,6 @@ ...@@ -111,7 +114,6 @@
display: block; display: block;
height: 96rpx; height: 96rpx;
width: 96rpx; width: 96rpx;
background-color: #18BC37;
border-radius: 96rpx; border-radius: 96rpx;
} }
.middle { .middle {
...@@ -129,6 +131,7 @@ ...@@ -129,6 +131,7 @@
} }
.middle-next-item { .middle-next-item {
margin-top: 14rpx; margin-top: 14rpx;
color: #666666;
} }
} }
.right { .right {
......
pagesA/submitOrder/submitOrder.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<view class="right"> <view class="right">
<view class="goods-title">{{goods.title}}</view> <view class="goods-title">{{goods.title}}</view>
<view class="bottom-info"> <view class="bottom-info">
<view class="integral">{{goods.sellingPrice}}积分</view> <view class="integral">{{goods.sellingPrice}}<text>积分</text></view>
<view class="buy-button"> <view class="buy-button">
<image v-if="goodsNum===1" class="reduce" src="../../static/reduce.png" mode="" @click="reduce()"></image> <image v-if="goodsNum===1" class="reduce" src="../../static/reduce.png" mode="" @click="reduce()"></image>
<image v-else class="reduce" src="../../static/reduce-h.png" mode="" @click="reduce()"></image> <image v-else class="reduce" src="../../static/reduce-h.png" mode="" @click="reduce()"></image>
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
立即兑换 立即兑换
</view> </view>
</view> </view>
<pwdCodeAlert closeName="showPwdAlert" v-show="showPwdAlert" :integral="payIntegral" @pwdSubmit="pwdSubmit"></pwdCodeAlert> <pwdCodeAlert ref="pwd" closeName="showPwdAlert" v-if="showPwdAlert" :integral="payIntegral" @pwdSubmit="pwdSubmit"></pwdCodeAlert>
<smsCodeAlert closeName="showSmsCodeAlert" v-show="showSmsCodeAlert" @smsCodeSubmit="smsCodeSubmit"></smsCodeAlert> <smsCodeAlert ref="sms" closeName="showSmsCodeAlert" v-if="showSmsCodeAlert" @smsCodeSubmit="smsCodeSubmit"></smsCodeAlert>
<Alert v-show="errorAlert" :text="errorAlertText" @clickCertain="clickAlert" @clickCancel="clickAlert"/> <Alert v-show="errorAlert" :text="errorAlertText" @clickCertain="clickAlert" @clickCancel="clickAlert"/>
</view> </view>
</template> </template>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
methods: { methods: {
add() { add() {
if (this.$numUtils.numMulti(this.goods.sellingPrice+'', this.goodsNum+1) > Number(this.$store.state.userInfo.surplusIntegral)) { if (this.$numUtils.numMulti(this.goods.sellingPrice+'', this.goodsNum+1) > Number(this.$store.state.userInfo.surplusIntegral)) {
this.toast('积分不够') this.toast('积分不足')
return return
} }
this.goodsNum++ this.goodsNum++
...@@ -86,6 +86,10 @@ ...@@ -86,6 +86,10 @@
this.orderId = res.data.orderId this.orderId = res.data.orderId
if (res.data.isSendSms === 1) { if (res.data.isSendSms === 1) {
this.showSmsCodeAlert = true this.showSmsCodeAlert = true
let that = this
setTimeout(function() {
that.$refs.sms.startTime()
}, 500);
} else { } else {
this.showPwdAlert = true this.showPwdAlert = true
} }
...@@ -113,6 +117,7 @@ ...@@ -113,6 +117,7 @@
this.$net.post('/payment/validation', {'orderId':this.orderId,'smsCode':e}).then(res=>{ this.$net.post('/payment/validation', {'orderId':this.orderId,'smsCode':e}).then(res=>{
if (res.code === 200) { if (res.code === 200) {
this.showSmsCodeAlert = false this.showSmsCodeAlert = false
this.$refs.sms.close()
this.showPwdAlert = true this.showPwdAlert = true
} else { } else {
this.toast(res.message) this.toast(res.message)
...@@ -122,8 +127,13 @@ ...@@ -122,8 +127,13 @@
pwdSubmit(e) { pwdSubmit(e) {
this.$net.post('/payment', {'orderId':this.orderId,'payPasswd':e}).then(res=>{ this.$net.post('/payment', {'orderId':this.orderId,'payPasswd':e}).then(res=>{
if (res.code === 200) { if (res.code === 200) {
this.$refs.pwd.close()
this.showPwdAlert = false this.showPwdAlert = false
this.$router.push('OrderDetail',{'orderId':res.data.orderId}) this.toast('支付成功', 1000)
let that = this
setTimeout(function() {
that.$router.push('OrderDetail',{'orderId':res.data.orderId})
}, 1000);
} else { } else {
this.toast(res.message) this.toast(res.message)
} }
...@@ -160,6 +170,7 @@ ...@@ -160,6 +170,7 @@
width: 200rpx; width: 200rpx;
display: block; display: block;
border-radius: 8rpx; border-radius: 8rpx;
border: 1rpx solid #EEEEEE;
} }
.right { .right {
margin-left: 16rpx; margin-left: 16rpx;
...@@ -193,6 +204,10 @@ ...@@ -193,6 +204,10 @@
height: 36rpx; height: 36rpx;
line-height: 36rpx; line-height: 36rpx;
color: #FF0520; color: #FF0520;
font-weight: bolder;
text{
font-weight: 400;
}
} }
.buy-button { .buy-button {
position: relative; position: relative;
......
pagesA/webView/webView.vue 0 → 100644
<template>
<view>
<web-view :src="url"></web-view>
</view>
</template>
<script>
export default {
data() {
return {
url: 'https://qyflpt.sobot.com/chat/h5/v2/index.html?sysnum=dabbf814ab064e4ba9fe1f7e729db6ab&channelid=196'
};
},
onLoad(options) {
let openUrl = options.url;
if (openUrl) {
this.url = decodeURIComponent(openUrl)
}
}
}
</script>
<style lang="scss">
</style>
router/router.js
...@@ -15,7 +15,9 @@ const routers = { ...@@ -15,7 +15,9 @@ const routers = {
'SetPwd': '/pagesA/SetPwd/SetPwd', 'SetPwd': '/pagesA/SetPwd/SetPwd',
'OrderDetail': '/pagesA/orderDetail/orderDetail', 'OrderDetail': '/pagesA/orderDetail/orderDetail',
'Coupon': '/pagesA/coupon/coupon', 'Coupon': '/pagesA/coupon/coupon',
'AlertToLogin': '/pagesA/AlertToLogin/AlertToLogin' 'AlertToLogin': '/pagesA/AlertToLogin/AlertToLogin',
'Agreement': '/pagesA/agreement/agreement',
'WebView': '/pagesA/webView/webView'
} }
export function push(routerName, params, events) { export function push(routerName, params, events) {
...@@ -70,6 +72,7 @@ export function replaceTo(routerName, params) { ...@@ -70,6 +72,7 @@ export function replaceTo(routerName, params) {
} }
export function goLandPage (url) { export function goLandPage (url) {
console.log(url);
let pageUrl = url let pageUrl = url
let routerName = url let routerName = url
if (url.indexOf('?')>-1) { if (url.indexOf('?')>-1) {
......
static/eye-off.png
static/eye-off.png

2.51 KB | W: | H:

static/eye-off.png

1.42 KB | W: | H:

static/eye-off.png
static/eye-off.png
static/eye-off.png
static/eye-off.png
  • 2-up
  • Swipe
  • Onion skin
static/eye-open.png
static/eye-open.png

1.83 KB | W: | H:

static/eye-open.png

1.38 KB | W: | H:

static/eye-open.png
static/eye-open.png
static/eye-open.png
static/eye-open.png
  • 2-up
  • Swipe
  • Onion skin
static/integral-empty-icon.png
static/integral-empty-icon.png

106 KB | W: | H:

static/integral-empty-icon.png

22.9 KB | W: | H:

static/integral-empty-icon.png
static/integral-empty-icon.png
static/integral-empty-icon.png
static/integral-empty-icon.png
  • 2-up
  • Swipe
  • Onion skin
static/logo.png
static/logo.png

3.93 KB | W: | H:

static/logo.png

407 KB | W: | H:

static/logo.png
static/logo.png
static/logo.png
static/logo.png
  • 2-up
  • Swipe
  • Onion skin
static/select-h.png
static/select-h.png

1.55 KB | W: | H:

static/select-h.png

1.5 KB | W: | H:

static/select-h.png
static/select-h.png
static/select-h.png
static/select-h.png
  • 2-up
  • Swipe
  • Onion skin
uni_modules/uni-swiper-dot/changelog.md 0 → 100644
## 1.2.0（2021-11-19）
- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-swiper-dot](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
## 1.1.0（2021-07-30）
- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
## 1.0.6（2021-05-12）
- 新增 示例地址
- 修复 示例项目缺少组件的Bug
## 1.0.5（2021-02-05）
- 调整为uni_modules目录规范
- 新增 clickItem 事件，支持指示点控制轮播
- 新增 支持 pc 可用
uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue 0 → 100644
<template>
<view class="uni-swiper__warp">
<slot />
<view v-if="mode === 'default'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='default'>
<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
'width': (index === current? dots.width*2:dots.width ) + 'px','height':dots.width/2 +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border-radius':'0px'}"
:key="index" class="uni-swiper__dots-item uni-swiper__dots-bar" />
</view>
<view v-if="mode === 'dot'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='dot'>
<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
'width': dots.width + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
:key="index" class="uni-swiper__dots-item" />
</view>
<view v-if="mode === 'round'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='round'>
<view v-for="(item,index) in info" @click="clickItem(index)" :class="[index === current&&'uni-swiper__dots-long']" :style="{
'width':(index === current? dots.width*3:dots.width ) + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
:key="index" class="uni-swiper__dots-item " />
</view>
<view v-if="mode === 'nav'" key='nav' :style="{'background-color':dotsStyles.backgroundColor,'bottom':'0'}" class="uni-swiper__dots-box uni-swiper__dots-nav">
<text :style="{'color':dotsStyles.color}" class="uni-swiper__dots-nav-item">{{ (current+1)+"/"+info.length +' ' +info[current][field] }}</text>
</view>
<view v-if="mode === 'indexes'" key='indexes' :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box">
<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
'width':dots.width + 'px','height':dots.height +'px' ,'color':index === current?dots.selectedColor:dots.color,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
:key="index" class="uni-swiper__dots-item uni-swiper__dots-indexes"><text class="uni-swiper__dots-indexes-text">{{ index+1 }}</text></view>
</view>
</view>
</template>
<script>
/**
* SwiperDod 轮播图指示点
* @description 自定义轮播图指示点
* @tutorial https://ext.dcloud.net.cn/plugin?id=284
* @property {Number} current 当前指示点索引，必须是通过 `swiper` 的 `change` 事件获取到的 `e.detail.current`
* @property {String} mode = [default|round|nav|indexes] 指示点的类型
* @value defualt 默认指示点
* @value round 圆形指示点
* @value nav 条形指示点
* @value indexes 索引指示点
* @property {String} field mode 为 nav 时，显示的内容字段（mode = nav 时必填）
* @property {String} info 轮播图的数据，通过数组长度决定指示点个数
* @property {Object} dotsStyles 指示点样式
* @event {Function} clickItem 组件触发点击事件时触发，e={currentIndex}
*/
export default {
name: 'UniSwiperDot',
emits:['clickItem'],
props: {
info: {
type: Array,
default () {
return []
}
},
current: {
type: Number,
default: 0
},
dotsStyles: {
type: Object,
default () {
return {}
}
},
// 类型 ：default(默认) indexes long nav
mode: {
type: String,
default: 'default'
},
// 只在 nav 模式下生效，变量名称
field: {
type: String,
default: ''
}
},
data() {
return {
dots: {
width: 6,
height: 6,
bottom: 10,
color: '#fff',
backgroundColor: 'rgba(0, 0, 0, .3)',
border: '1px rgba(0, 0, 0, .3) solid',
selectedBackgroundColor: '#333',
selectedBorder: '1px rgba(0, 0, 0, .9) solid'
}
}
},
watch: {
dotsStyles(newVal) {
this.dots = Object.assign(this.dots, this.dotsStyles)
},
mode(newVal) {
if (newVal === 'indexes') {
this.dots.width = 14
this.dots.height = 14
} else {
this.dots.width = 6
this.dots.height = 6
}
}
},
created() {
if (this.mode === 'indexes') {
this.dots.width = 12
this.dots.height = 12
}
this.dots = Object.assign(this.dots, this.dotsStyles)
},
methods: {
clickItem(index) {
this.$emit('clickItem', index)
}
}
}
</script>
<style lang="scss" scoped>
.uni-swiper__warp {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex: 1;
flex-direction: column;
position: relative;
overflow: hidden;
}
.uni-swiper__dots-box {
position: absolute;
bottom: 10px;
left: 0;
right: 0;
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex: 1;
flex-direction: row;
justify-content: center;
align-items: center;
}
.uni-swiper__dots-item {
width: 8px;
border-radius: 100px;
margin-left: 6px;
background-color: rgba(0, 0, 0, 0.4);
/* #ifndef APP-NVUE */
cursor: pointer;
/* #endif */
/* #ifdef H5 */
// border-width: 5px 0;
// border-style: solid;
// border-color: transparent;
// background-clip: padding-box;
/* #endif */
// transition: width 0.2s linear; 不要取消注释，不然会不能变色
}
.uni-swiper__dots-item:first-child {
margin: 0;
}
.uni-swiper__dots-default {
border-radius: 100px;
}
.uni-swiper__dots-long {
border-radius: 50px;
}
.uni-swiper__dots-bar {
border-radius: 50px;
}
.uni-swiper__dots-nav {
bottom: 0px;
// height: 26px;
padding: 8px 0;
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex: 1;
flex-direction: row;
justify-content: flex-start;
align-items: center;
background-color: rgba(0, 0, 0, 0.2);
}
.uni-swiper__dots-nav-item {
/* overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; */
font-size: 14px;
color: #fff;
margin: 0 15px;
}
.uni-swiper__dots-indexes {
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
// flex: 1;
justify-content: center;
align-items: center;
}
.uni-swiper__dots-indexes-text {
color: #fff;
font-size: 12px;
line-height: 14px;
}
</style>
uni_modules/uni-swiper-dot/package.json 0 → 100644
{
"id": "uni-swiper-dot",
"displayName": "uni-swiper-dot 轮播图指示点",
"version": "1.2.0",
"description": "自定义轮播图指示点组件",
"keywords": [
"uni-ui",
"uniui",
"轮播图指示点",
"dot",
"swiper"
],
"repository": "https://github.com/dcloudio/uni-ui",
"engines": {
"HBuilderX": ""
},
"directories": {
"example": "../../temps/example_temps"
},
"dcloudext": {
"category": [
"前端组件",
"通用组件"
],
"sale": {
"regular": {
"price": "0.00"
},
"sourcecode": {
"price": "0.00"
}
},
"contact": {
"qq": ""
},
"declaration": {
"ads": "无",
"data": "无",
"permissions": "无"
},
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
},
"uni_modules": {
"dependencies": ["uni-scss"],
"encrypt": [],
"platforms": {
"cloud": {
"tcb": "y",
"aliyun": "y"
},
"client": {
"App": {
"app-vue": "y",
"app-nvue": "y"
},
"H5-mobile": {
"Safari": "y",
"Android Browser": "y",
"微信浏览器(Android)": "y",
"QQ浏览器(Android)": "y"
},
"H5-pc": {
"Chrome": "y",
"IE": "y",
"Edge": "y",
"Firefox": "y",
"Safari": "y"
},
"小程序": {
"微信": "y",
"阿里": "y",
"百度": "y",
"字节跳动": "y",
"QQ": "y"
},
"快应用": {
"华为": "u",
"联盟": "u"
},
"Vue": {
"vue2": "y",
"vue3": "y"
}
}
}
}
}
\ No newline at end of file
uni_modules/uni-swiper-dot/readme.md 0 → 100644
## SwiperDot 轮播图指示点
> **组件名：uni-swiper-dot**
> 代码块： `uSwiperDot`
自定义轮播图指示点
### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
\ No newline at end of file
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/.sourcemap/mp-weixin/components/AlertRecover/AlertRecover.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/coupon/coupon.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/orderDetail/orderDetail.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/mp-weixin/app.json
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
"SetPwd/SetPwd", "SetPwd/SetPwd",
"orderDetail/orderDetail", "orderDetail/orderDetail",
"coupon/coupon", "coupon/coupon",
"AlertToLogin/AlertToLogin" "AlertToLogin/AlertToLogin",
"agreement/agreement",
"webView/webView"
] ]
} }
], ],
......
unpackage/dist/dev/mp-weixin/common/vendor.js
...@@ -2241,9 +2241,9 @@ function normalizeComponent ( ...@@ -2241,9 +2241,9 @@ function normalizeComponent (
var _router = _interopRequireDefault(__webpack_require__(/*! ../router/router.js */ 15));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} var _router = _interopRequireDefault(__webpack_require__(/*! ../router/router.js */ 15));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
// 测试环境 // 测试环境
var base_url = 'https://sandbox-api-welfare.wasair.com/api.v1/lite'; // const base_url = 'https://sandbox-api-welfare.wasair.com/api.v1/lite'
// 正式环境 // 正式环境
// const base_url = 'https://wxlite-api-scm.wasair.com' var base_url = 'https://api-fuli.wasair.com/api.v1/lite';
function post(url, params) { function post(url, params) {
var newParams = params || {}; var newParams = params || {};
...@@ -2256,19 +2256,29 @@ function post(url, params) { ...@@ -2256,19 +2256,29 @@ function post(url, params) {
header: headerCom(params), header: headerCom(params),
data: newParams, data: newParams,
success: function success(res) { success: function success(res) {
if (res.data.code == 301 && newParams.refreshToken !== 'not') { if (res.data.code == 301) {
tokenSave(''); tokenSave('');
_index.default.commit('refreshUserInfo', {}); _index.default.commit('refreshUserInfo', {});
_router.default.push('AlertToLogin', { 'message': res.message || '未知错误' }); _index.default.commit('refreshUserLogin', false);
if (newParams.refreshToken !== 'not') {
_router.default.push('AlertToLogin', { 'message': res.data.message || '未知错误' });
return; return;
} }
} else if (res.data.code == 302) {
// tokenSave(res.data.data.token)
// let pages = getCurrentPages()
// let index = pages.length-1
// uni.redirectTo({
// url: pages[index].$page.fullPath
// })
tokenSave('');
_index.default.commit('refreshUserInfo', {});
_index.default.commit('refreshUserLogin', false);
uni.showToast({
title: '登录信息已失效，请重新登录' });
if (res.data.code == 302) { } else {
tokenSave(res.data.token); var result = res.data || {};
post(url, params);
return;
}
var result = res.data;
var tempData = { var tempData = {
"list": [], "list": [],
"paginate": { "paginate": {
...@@ -2280,6 +2290,7 @@ function post(url, params) { ...@@ -2280,6 +2290,7 @@ function post(url, params) {
result.data = result.data || tempData; result.data = result.data || tempData;
resolve(result); resolve(result);
}
}, },
fail: function fail(err) { fail: function fail(err) {
reject(err); reject(err);
...@@ -2303,15 +2314,25 @@ function get(url, params) { ...@@ -2303,15 +2314,25 @@ function get(url, params) {
if (res.data.code == 301 && newParams.refreshToken !== 'not') { if (res.data.code == 301 && newParams.refreshToken !== 'not') {
tokenSave(''); tokenSave('');
_index.default.commit('refreshUserInfo', {}); _index.default.commit('refreshUserInfo', {});
_router.default.push('AlertToLogin', { 'message': res.message || '未知错误' }); _index.default.commit('refreshUserLogin', false);
return; _router.default.push('AlertToLogin', { 'message': res.data.message || '未知错误' });
}
if (res.data.code == 302) {
tokenSave(res.data.token);
post(url, params);
return; return;
} } else if (res.data.code == 302) {
// tokenSave(res.data.data.token)
// let pages = getCurrentPages()
// let index = pages.length-1
// uni.redirectTo({
// url: pages[index].$page.fullPath
// })
tokenSave('');
_index.default.commit('refreshUserInfo', {});
_index.default.commit('refreshUserLogin', false);
uni.showToast({
title: '登录信息已失效，请重新登录' });
} else {
resolve(res.data); resolve(res.data);
}
}, },
fail: function fail(err) { fail: function fail(err) {
reject(err); reject(err);
...@@ -3756,7 +3777,9 @@ var routers = { ...@@ -3756,7 +3777,9 @@ var routers = {
'SetPwd': '/pagesA/SetPwd/SetPwd', 'SetPwd': '/pagesA/SetPwd/SetPwd',
'OrderDetail': '/pagesA/orderDetail/orderDetail', 'OrderDetail': '/pagesA/orderDetail/orderDetail',
'Coupon': '/pagesA/coupon/coupon', 'Coupon': '/pagesA/coupon/coupon',
'AlertToLogin': '/pagesA/AlertToLogin/AlertToLogin' }; 'AlertToLogin': '/pagesA/AlertToLogin/AlertToLogin',
'Agreement': '/pagesA/agreement/agreement',
'WebView': '/pagesA/webView/webView' };
function push(routerName, params, events) { function push(routerName, params, events) {
...@@ -3811,6 +3834,7 @@ function replaceTo(routerName, params) { ...@@ -3811,6 +3834,7 @@ function replaceTo(routerName, params) {
} }
function goLandPage(url) { function goLandPage(url) {
console.log(url);
var pageUrl = url; var pageUrl = url;
var routerName = url; var routerName = url;
if (url.indexOf('?') > -1) { if (url.indexOf('?') > -1) {
...@@ -4000,7 +4024,26 @@ function moneyFormat(num, counts, mark) { ...@@ -4000,7 +4024,26 @@ function moneyFormat(num, counts, mark) {
/***/ }), /***/ }),
/***/ 160: /***/ 17:
/*!*****************************************************************!*\
!*** /Users/wangjian/Desktop/HBuilder/FuLiMini/common/toast.js ***!
\*****************************************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = toast;function toast(text, time) {
uni.showToast({
icon: 'none',
title: text || '',
duration: time || 1500 });
}
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
/***/ }),
/***/ 176:
/*!******************************************************************************************************************!*\ /*!******************************************************************************************************************!*\
!*** /Users/wangjian/Desktop/HBuilder/FuLiMini/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js ***! !*** /Users/wangjian/Desktop/HBuilder/FuLiMini/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js ***!
\******************************************************************************************************************/ \******************************************************************************************************************/
...@@ -4008,9 +4051,9 @@ function moneyFormat(num, counts, mark) { ...@@ -4008,9 +4051,9 @@ function moneyFormat(num, counts, mark) {
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 161)); Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 177));
var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 162)); var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 178));
var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 163));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}var _default = var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 179));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}var _default =
{ {
en: _en.default, en: _en.default,
'zh-Hans': _zhHans.default, 'zh-Hans': _zhHans.default,
...@@ -4018,7 +4061,7 @@ var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 1 ...@@ -4018,7 +4061,7 @@ var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 1
/***/ }), /***/ }),
/***/ 161: /***/ 177:
/*!*****************************************************************************************************************!*\ /*!*****************************************************************************************************************!*\
!*** /Users/wangjian/Desktop/HBuilder/FuLiMini/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json ***! !*** /Users/wangjian/Desktop/HBuilder/FuLiMini/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json ***!
\*****************************************************************************************************************/ \*****************************************************************************************************************/
...@@ -4029,7 +4072,7 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"下拉加载更多 ...@@ -4029,7 +4072,7 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"下拉加载更多
/***/ }), /***/ }),
/***/ 162: /***/ 178:
/*!**********************************************************************************************************************!*\ /*!**********************************************************************************************************************!*\
!*** /Users/wangjian/Desktop/HBuilder/FuLiMini/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json ***! !*** /Users/wangjian/Desktop/HBuilder/FuLiMini/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json ***!
\**********************************************************************************************************************/ \**********************************************************************************************************************/
...@@ -4040,7 +4083,7 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉显示更多 ...@@ -4040,7 +4083,7 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉显示更多
/***/ }), /***/ }),
/***/ 163: /***/ 179:
/*!**********************************************************************************************************************!*\ /*!**********************************************************************************************************************!*\
!*** /Users/wangjian/Desktop/HBuilder/FuLiMini/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json ***! !*** /Users/wangjian/Desktop/HBuilder/FuLiMini/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json ***!
\**********************************************************************************************************************/ \**********************************************************************************************************************/
...@@ -4051,25 +4094,6 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉顯示更多 ...@@ -4051,25 +4094,6 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉顯示更多
/***/ }), /***/ }),
/***/ 17:
/*!*****************************************************************!*\
!*** /Users/wangjian/Desktop/HBuilder/FuLiMini/common/toast.js ***!
\*****************************************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = toast;function toast(text, time) {
uni.showToast({
icon: 'none',
title: text || '',
duration: time || 1500 });
}
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
/***/ }),
/***/ 18: /***/ 18:
/*!*******************************************************************!*\ /*!*******************************************************************!*\
!*** /Users/wangjian/Desktop/HBuilder/FuLiMini/common/loading.js ***! !*** /Users/wangjian/Desktop/HBuilder/FuLiMini/common/loading.js ***!
...@@ -4127,7 +4151,7 @@ module.exports = g; ...@@ -4127,7 +4151,7 @@ module.exports = g;
/***/ }), /***/ }),
/***/ 248: /***/ 264:
/*!*************************************************************************************************************************!*\ /*!*************************************************************************************************************************!*\
!*** /Users/wangjian/Desktop/HBuilder/FuLiMini/uni_modules/uni-transition/components/uni-transition/createAnimation.js ***! !*** /Users/wangjian/Desktop/HBuilder/FuLiMini/uni_modules/uni-transition/components/uni-transition/createAnimation.js ***!
\*************************************************************************************************************************/ \*************************************************************************************************************************/
......
unpackage/dist/dev/mp-weixin/components/AlertRecover/AlertRecover.wxml
<view class="container data-v-47b7ea84"><view class="content data-v-47b7ea84"><image class="close data-v-47b7ea84" src="../../static/close-gray.png" mode data-event-opts="{{[['tap',[['close']]]]}}" bindtap="__e"></image><view class="top data-v-47b7ea84"><view class="title data-v-47b7ea84">卡券回收</view></view><view class="middle-content data-v-47b7ea84"><view class="title data-v-47b7ea84">卡片回收方法如下：</view><view class="first data-v-47b7ea84">1.点击下方“确认回收”按钮，进入58同城小程序。</view><view class="second data-v-47b7ea84">2.在58同城小程序的搜索框中输入“卡券”进行搜索,如下图：</view><image class="third data-v-47b7ea84" src="../../static/recover-1.png" mode></image><view class="four data-v-47b7ea84">3.在搜索结果中联系商家即可上门回收，如下图：</view><image class="five data-v-47b7ea84" src="../../static/recover-2.png" mode></image></view><view data-event-opts="{{[['tap',[['goMini']]]]}}" class="buy-bottom data-v-47b7ea84" bindtap="__e">确认回收</view></view></view> <view class="container data-v-47b7ea84"><view class="content data-v-47b7ea84"><image class="close data-v-47b7ea84" src="/static/close-w.png" mode data-event-opts="{{[['tap',[['close']]]]}}" bindtap="__e"></image><view class="top data-v-47b7ea84"><view class="title data-v-47b7ea84">卡券回收</view></view><view class="middle-content data-v-47b7ea84"><view class="title data-v-47b7ea84">卡片回收方法如下：</view><view class="first data-v-47b7ea84">1.点击下方“确认回收”按钮，进入58同城小程序。</view><view class="second data-v-47b7ea84">2.在58同城小程序的搜索框中输入“卡券”进行搜索,如下图：</view><image class="third data-v-47b7ea84" src="https://static-walfare.wasair.com/goods/2022/04/27/f2d5fa585896d784551b8a3131eb6b34.png" mode></image><view class="four data-v-47b7ea84">3.在搜索结果中联系商家即可上门回收，如下图：</view><image class="five data-v-47b7ea84" src="https://static-walfare.wasair.com/goods/2022/04/27/312c0872780557824aeb2d104ab3fd43.png" mode></image></view><view data-event-opts="{{[['tap',[['goMini']]]]}}" class="buy-bottom data-v-47b7ea84" bindtap="__e">确认回收</view></view></view>
\ No newline at end of file \ No newline at end of file
unpackage/dist/dev/mp-weixin/components/setPwdAlert/setPwdAlert.wxml
<view class="container data-v-1c468570"><view class="content data-v-1c468570"><image class="close data-v-1c468570" src="../../static/close-gray.png" mode data-event-opts="{{[['tap',[['close']]]]}}" bindtap="__e"></image><view class="title data-v-1c468570">设置支付密码</view><view class="subTitle data-v-1c468570">为保障您的积分安全，请先设置支付密码</view><view class="item first-item data-v-1c468570"><view class="data-v-1c468570">设置支付密码：</view><view class="input-content data-v-1c468570"><input class="input data-v-1c468570" password="{{!firstOpen}}" placeholder="请输入6位数字密码" placeholder-style="color:#999999" maxlength="6" data-event-opts="{{[['input',[['__set_model',['','firstPwd','$event',[]]]]]]}}" value="{{firstPwd}}" bindinput="__e"/><image class="eye data-v-1c468570" src="{{firstOpen?'../../static/eye-open.png':'../../static/eye-off.png'}}" mode data-event-opts="{{[['tap',[['clickEye',[1]]]]]}}" bindtap="__e"></image></view></view><view class="item data-v-1c468570"><view class="data-v-1c468570">确认支付密码：</view><view class="input-content data-v-1c468570"><input class="input data-v-1c468570" password="{{!secondOpen}}" placeholder="再次输入密码" placeholder-style="color:#999999" maxlength="6" data-event-opts="{{[['input',[['__set_model',['','secondPwd','$event',[]]]]]]}}" value="{{secondPwd}}" bindinput="__e"/><image class="eye data-v-1c468570" src="{{secondOpen?'../../static/eye-open.png':'../../static/eye-off.png'}}" mode data-event-opts="{{[['tap',[['clickEye',[2]]]]]}}" bindtap="__e"></image></view></view><view data-event-opts="{{[['tap',[['submit']]]]}}" class="buy-bottom data-v-1c468570" style="{{'background-color:'+(firstPwd===secondPwd&&secondPwd!=''?'#FF0520':'')+';'}}" bindtap="__e">确认支付密码</view></view></view> <view class="container data-v-1c468570"><view class="content data-v-1c468570"><image class="close data-v-1c468570" src="../../static/close-gray.png" mode data-event-opts="{{[['tap',[['close']]]]}}" bindtap="__e"></image><view class="title data-v-1c468570">设置支付密码</view><view class="subTitle data-v-1c468570">为保障您的积分安全，请先设置支付密码</view><view class="item first-item data-v-1c468570"><view class="data-v-1c468570">设置支付密码：</view><view class="input-content data-v-1c468570"><input class="input data-v-1c468570" password="{{!firstOpen}}" placeholder="请输入6位数字密码" placeholder-style="color:#999999" maxlength="6" data-event-opts="{{[['input',[['__set_model',['','firstPwd','$event',[]]]]]]}}" value="{{firstPwd}}" bindinput="__e"/><image class="eye data-v-1c468570" src="{{firstOpen?'../../static/eye-open.png':'../../static/eye-off.png'}}" mode data-event-opts="{{[['tap',[['clickEye',[1]]]]]}}" bindtap="__e"></image></view></view><view class="item data-v-1c468570"><view class="data-v-1c468570">确认支付密码：</view><view class="input-content data-v-1c468570"><input class="input data-v-1c468570" password="{{!secondOpen}}" placeholder="再次输入密码" placeholder-style="color:#999999" maxlength="6" data-event-opts="{{[['input',[['__set_model',['','secondPwd','$event',[]]]]]]}}" value="{{secondPwd}}" bindinput="__e"/><image class="eye data-v-1c468570" src="{{secondOpen?'../../static/eye-open.png':'../../static/eye-off.png'}}" mode data-event-opts="{{[['tap',[['clickEye',[2]]]]]}}" bindtap="__e"></image></view></view><view data-event-opts="{{[['tap',[['submit']]]]}}" class="buy-bottom data-v-1c468570" style="{{'background-color:'+(firstPwd===secondPwd&&secondPwd!=''?'#FF0520':'')+';'}}" bindtap="__e">确认</view></view></view>
\ No newline at end of file \ No newline at end of file
unpackage/dist/dev/mp-weixin/components/smsCodeAlert/smsCodeAlert.wxml
<view class="container data-v-7ab8fd78"><view class="content data-v-7ab8fd78"><image class="close data-v-7ab8fd78" src="../../static/close-gray.png" mode data-event-opts="{{[['tap',[['close']]]]}}" bindtap="__e"></image><view class="title data-v-7ab8fd78">短信验证</view><view class="subTitle data-v-7ab8fd78">已向<text class="data-v-7ab8fd78">{{getPhone}}</text>手机号发送了一条验证短信,请将验证码填写进输入框中。</view><view class="code-content data-v-7ab8fd78"><valid-code vue-id="dc65af7c-1" maxlength="{{4}}" data-ref="code" data-event-opts="{{[['^finish',[['getPwd']]],['^inputChange',[['inputChange']]]]}}" bind:finish="__e" bind:inputChange="__e" class="data-v-7ab8fd78 vue-ref" bind:__l="__l"></valid-code></view><view data-event-opts="{{[['tap',[['submit']]]]}}" class="buy-bottom data-v-7ab8fd78" style="{{'background-color:'+(btnActive?'#FF0520':'')+';'}}" bindtap="__e">确认</view></view></view> <view class="container data-v-7ab8fd78"><view class="content data-v-7ab8fd78"><image class="close data-v-7ab8fd78" src="../../static/close-gray.png" mode data-event-opts="{{[['tap',[['close']]]]}}" bindtap="__e"></image><view class="title data-v-7ab8fd78">短信验证</view><view class="subTitle data-v-7ab8fd78">已向<text class="data-v-7ab8fd78">{{getPhone}}</text>手机号发送了一条验证短信,请将验证码填写进输入框中。</view><view class="code-content data-v-7ab8fd78"><valid-code vue-id="dc65af7c-1" maxlength="{{4}}" data-ref="code" data-event-opts="{{[['^finish',[['getPwd']]],['^inputChange',[['inputChange']]]]}}" bind:finish="__e" bind:inputChange="__e" class="data-v-7ab8fd78 vue-ref" bind:__l="__l"></valid-code></view><view data-event-opts="{{[['tap',[['submit']]]]}}" class="buy-bottom data-v-7ab8fd78" style="{{'background-color:'+(btnActive?'#FF0520':'')+';'}}" bindtap="__e">确认</view><view data-event-opts="{{[['tap',[['sendCode']]]]}}" class="re-send data-v-7ab8fd78" style="{{'color:'+(isSendCode?'#999999':'#FF0520')+';'}}" bindtap="__e">{{''+btnText+''}}</view></view></view>
\ No newline at end of file \ No newline at end of file
unpackage/dist/dev/mp-weixin/components/validCode/validCode.wxml
<view class="code-area data-v-37e75918"><view class="flex-box data-v-37e75918"><input class="hide-input data-v-37e75918" type="number" focus="true" maxlength="{{maxlength}}" data-event-opts="{{[['input',[['getVal',['$event']]]]]}}" value="{{val}}" bindinput="__e"/><view class="{{['data-v-37e75918','item',[(codeIndex==1)?'active':'',(!isPwd)?'code-item':'']]}}"><view class="line data-v-37e75918"></view><block wx:if="{{isPwd&&codeArr.length>=1}}"><block class="data-v-37e75918"><text class="dot data-v-37e75918">.</text></block></block><block wx:else><block class="data-v-37e75918">{{''+(codeArr[0]?codeArr[0]:'')}}</block></block></view><view class="{{['data-v-37e75918','item',[(codeIndex==2)?'active':'',(!isPwd)?'code-item':'']]}}"><view class="line data-v-37e75918"></view><block wx:if="{{isPwd&&codeArr.length>=2}}"><block class="data-v-37e75918"><text class="dot data-v-37e75918">.</text></block></block><block wx:else><block class="data-v-37e75918">{{''+(codeArr[1]?codeArr[1]:'')}}</block></block></view><view class="{{['data-v-37e75918','item',[(codeIndex==3)?'active':'',(!isPwd)?'code-item':'']]}}"><view class="line data-v-37e75918"></view><block wx:if="{{isPwd&&codeArr.length>=3}}"><block class="data-v-37e75918"><text class="dot data-v-37e75918">.</text></block></block><block wx:else><block class="data-v-37e75918">{{''+(codeArr[2]?codeArr[2]:'')}}</block></block></view><view class="{{['data-v-37e75918','item',[(codeIndex==4)?'active':'',(!isPwd)?'code-item':'']]}}"><view class="line data-v-37e75918"></view><block wx:if="{{isPwd&&codeArr.length>=4}}"><block class="data-v-37e75918"><text class="dot data-v-37e75918">.</text></block></block><block wx:else><block class="data-v-37e75918">{{''+(codeArr[3]?codeArr[3]:'')}}</block></block></view><block wx:if="{{maxlength===6}}"><block class="data-v-37e75918"><view class="{{['data-v-37e75918','item',[(codeIndex==5)?'active':'']]}}"><view class="line data-v-37e75918"></view><block wx:if="{{isPwd&&codeArr.length>=5}}"><block class="data-v-37e75918"><text class="dot data-v-37e75918">.</text></block></block><block wx:else><block class="data-v-37e75918">{{''+(codeArr[4]?codeArr[4]:'')}}</block></block></view><view class="{{['data-v-37e75918','item',[(codeIndex==6)?'active':'']]}}"><view class="line data-v-37e75918"></view><block wx:if="{{isPwd&&codeArr.length>=6}}"><block class="data-v-37e75918"><text class="dot data-v-37e75918">.</text></block></block><block wx:else><block class="data-v-37e75918">{{''+(codeArr[5]?codeArr[5]:'')}}</block></block></view></block></block></view></view> <view class="code-area data-v-37e75918"><view class="flex-box data-v-37e75918"><view class="{{['data-v-37e75918','item',[(codeIndex==1)?'active':'',(!isPwd)?'code-item':'']]}}"><view class="line data-v-37e75918"></view><block wx:if="{{isPwd&&codeArr.length>=1}}"><block class="data-v-37e75918"><text class="dot data-v-37e75918">.</text></block></block><block wx:else><block class="data-v-37e75918">{{''+(codeArr[0]?codeArr[0]:'')}}</block></block></view><view class="{{['data-v-37e75918','item',[(codeIndex==2)?'active':'',(!isPwd)?'code-item':'']]}}"><view class="line data-v-37e75918"></view><block wx:if="{{isPwd&&codeArr.length>=2}}"><block class="data-v-37e75918"><text class="dot data-v-37e75918">.</text></block></block><block wx:else><block class="data-v-37e75918">{{''+(codeArr[1]?codeArr[1]:'')}}</block></block></view><view class="{{['data-v-37e75918','item',[(codeIndex==3)?'active':'',(!isPwd)?'code-item':'']]}}"><view class="line data-v-37e75918"></view><block wx:if="{{isPwd&&codeArr.length>=3}}"><block class="data-v-37e75918"><text class="dot data-v-37e75918">.</text></block></block><block wx:else><block class="data-v-37e75918">{{''+(codeArr[2]?codeArr[2]:'')}}</block></block></view><view class="{{['data-v-37e75918','item',[(codeIndex==4)?'active':'',(!isPwd)?'code-item':'']]}}"><view class="line data-v-37e75918"></view><block wx:if="{{isPwd&&codeArr.length>=4}}"><block class="data-v-37e75918"><text class="dot data-v-37e75918">.</text></block></block><block wx:else><block class="data-v-37e75918">{{''+(codeArr[3]?codeArr[3]:'')}}</block></block></view><block wx:if="{{maxlength===6}}"><block class="data-v-37e75918"><view class="{{['data-v-37e75918','item',[(codeIndex==5)?'active':'']]}}"><view class="line data-v-37e75918"></view><block wx:if="{{isPwd&&codeArr.length>=5}}"><block class="data-v-37e75918"><text class="dot data-v-37e75918">.</text></block></block><block wx:else><block class="data-v-37e75918">{{''+(codeArr[4]?codeArr[4]:'')}}</block></block></view><view class="{{['data-v-37e75918','item',[(codeIndex==6)?'active':'']]}}"><view class="line data-v-37e75918"></view><block wx:if="{{isPwd&&codeArr.length>=6}}"><block class="data-v-37e75918"><text class="dot data-v-37e75918">.</text></block></block><block wx:else><block class="data-v-37e75918">{{''+(codeArr[5]?codeArr[5]:'')}}</block></block></view></block></block><input class="hide-input data-v-37e75918" type="number" focus="{{true}}" auto-focus="true" maxlength="{{maxlength}}" data-event-opts="{{[['input',[['getVal',['$event']]]]]}}" value="{{val}}" bindinput="__e"/></view></view>
\ No newline at end of file \ No newline at end of file
unpackage/dist/dev/mp-weixin/pages/home/home.wxss
page { page {
background-color: #FFEEEE; background-color: #f5f5f5;
} }
@charset "UTF-8"; @charset "UTF-8";
...@@ -35,6 +35,7 @@ page { ...@@ -35,6 +35,7 @@ page {
display: flex; display: flex;
position: relative; position: relative;
flex-direction: column; flex-direction: column;
overflow-x: hidden;
} }
.layout .header-cover.data-v-92bb8f34 { .layout .header-cover.data-v-92bb8f34 {
height: 100rpx; height: 100rpx;
...@@ -123,62 +124,205 @@ page { ...@@ -123,62 +124,205 @@ page {
z-index: 999; z-index: 999;
right: 0; right: 0;
} }
.layout .list.data-v-92bb8f34 { .layout .swiper-container.data-v-92bb8f34 {
border-radius: 30rpx;
background-color: #FFFFFF;
padding-bottom: 30rpx;
z-index: 99;
margin-top: -50rpx;
width: 100%;
}
.layout .swiper-container .swiper.data-v-92bb8f34 {
height: 572rpx;
width: 100%;
border-radius: 30rpx;
}
.layout .swiper-container .swiper .swiper-list.data-v-92bb8f34 {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
background: #ffeeee; background: #ffffff;
border-radius: 30rpx 30rpx 0rpx 0rpx; border-radius: 30rpx;
padding-top: 25rpx; padding: 30rpx 5rpx 0;
margin-top: -50rpx;
z-index: 99; z-index: 99;
padding: 15rpx 15rpx;
flex-wrap: wrap; flex-wrap: wrap;
width: 100%;
height: 540rpx;
} }
.layout .list .item.data-v-92bb8f34 { .layout .swiper-container .swiper .swiper-list .item.data-v-92bb8f34 {
width: 50%; width: 148rpx;
height: 144rpx; text-align: center;
margin-top: 15rpx; padding-bottom: 18rpx;
margin-bottom: 15rpx; }
.layout .swiper-container .swiper .swiper-list .item .icon.data-v-92bb8f34 {
width: 96rpx;
height: 96rpx;
margin: 0 auto;
display: block;
}
.layout .swiper-container .swiper .swiper-list .item .item-title.data-v-92bb8f34 {
margin-top: 12rpx;
font-size: 24rpx;
color: #333333;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
width: 148rpx;
padding: 0;
}
.layout .swiper-container .swiper .swiper-list .item .item-desc.data-v-92bb8f34 {
font-size: 20rpx;
color: #999999;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
width: 148rpx;
padding: 0;
} }
.layout .list .item .item-layout.data-v-92bb8f34 { .layout .swiper-container .indicator.data-v-92bb8f34 {
margin: 30rpx auto 0;
display: flex; display: flex;
flex-direction: row;
align-items: center;
justify-content: center; justify-content: center;
height: 144rpx;
margin: 0 15rpx;
background: #ffffff;
border-radius: 20rpx;
padding-left: 15rpx;
padding-right: 15rpx;
overflow: hidden;
} }
.layout .list .item .item-layout .icon.data-v-92bb8f34 { .layout .swiper-container .indicator .swiper-dot.data-v-92bb8f34 {
width: 90rpx; width: 12rpx;
height: 90rpx; height: 8rpx;
border-radius: 90rpx; background: #DDDDDD;
border-radius: 4rpx;
margin-left: 6rpx;
} }
.layout .list .item .item-layout .item-right.data-v-92bb8f34 { .layout .swiper-container .indicator .swiper-dot-active.data-v-92bb8f34 {
width: 32rpx;
height: 8rpx;
background: #FF3737;
border-radius: 4rpx;
}
.layout .list.data-v-92bb8f34 {
display: flex; display: flex;
flex: 1; flex-direction: row;
flex-direction: column; background: #FFFFFF;
margin-left: 20rpx; border-radius: 30rpx;
overflow: hidden; padding: 30rpx 5rpx 12rpx;
z-index: 99;
flex-wrap: wrap;
width: 100%;
height: 100%;
margin-top: -50rpx;
} }
.layout .list .item .item-layout .item-right .item-title.data-v-92bb8f34 { .layout .list .item.data-v-92bb8f34 {
font-size: 30rpx; width: 148rpx;
font-weight: bolder; text-align: center;
padding-bottom: 18rpx;
}
.layout .list .item .icon.data-v-92bb8f34 {
width: 96rpx;
height: 96rpx;
margin: 0 auto;
display: block;
}
.layout .list .item .item-title.data-v-92bb8f34 {
margin-top: 12rpx;
font-size: 24rpx;
color: #333333; color: #333333;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
padding: 0;
width: 148rpx;
} }
.layout .list .item .item-layout .item-right .item-desc.data-v-92bb8f34 { .layout .list .item .item-desc.data-v-92bb8f34 {
font-size: 24rpx; font-size: 20rpx;
color: #999999; color: #999999;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
margin-top: 15rpx;
overflow: hidden; overflow: hidden;
width: 148rpx;
padding: 0;
}
.layout .bottom-list.data-v-92bb8f34 {
margin: 20rpx 0;
background-color: #FFFFFF;
border-radius: 30rpx;
padding: 30rpx;
}
.layout .bottom-list .top.data-v-92bb8f34 {
display: flex;
align-items: center;
}
.layout .bottom-list .top .img.data-v-92bb8f34 {
height: 32rpx;
width: 32rpx;
}
.layout .bottom-list .top .name.data-v-92bb8f34 {
margin-left: 10rpx;
font-size: 32rpx;
font-weight: bolder;
font-weight: bolder;
}
.layout .bottom-list .item.data-v-92bb8f34 {
height: 240rpx;
margin-top: 30rpx;
display: flex;
}
.layout .bottom-list .item .img.data-v-92bb8f34 {
height: 240rpx;
width: 240rpx;
background-color: #F9F9F9;
border-radius: 8rpx;
border: 1rpx solid #F5F5F5;
}
.layout .bottom-list .item .right.data-v-92bb8f34 {
margin-top: 20rpx;
margin-left: 20rpx;
}
.layout .bottom-list .item .right .title-container.data-v-92bb8f34 {
height: 80rpx;
width: 428rpx;
font-size: 30rpx;
color: #333333;
line-height: 44rpx;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
vertical-align: middle;
}
.layout .bottom-list .item .right .title-container .brand.data-v-92bb8f34 {
font-size: 22rpx;
line-height: 32rpx;
color: #FFFFFF;
height: 30rpx;
padding: 0 10rpx;
background-color: #FF0520;
border-radius: 15rpx;
position: relative;
top: -2rpx;
margin-right: 10rpx;
}
.layout .bottom-list .item .right .bottom.data-v-92bb8f34 {
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 82rpx;
}
.layout .bottom-list .item .right .bottom .money.data-v-92bb8f34 {
color: #FF0520;
font-size: 38rpx;
font-weight: bolder;
}
.layout .bottom-list .item .right .bottom .money text.data-v-92bb8f34 {
font-size: 28rpx;
font-weight: 400;
}
.layout .bottom-list .item .right .bottom .btn.data-v-92bb8f34 {
height: 56rpx;
width: 156rpx;
border-radius: 28rpx;
background-color: #FF3737;
color: #ffffff;
line-height: 58rpx;
font-size: 28rpx;
text-align: center;
} }
unpackage/dist/dev/mp-weixin/pages/mine/mine.js
...@@ -96,7 +96,7 @@ var components ...@@ -96,7 +96,7 @@ var components
try { try {
components = { components = {
AlertRecover: function() { AlertRecover: function() {
return __webpack_require__.e(/*! import() | components/AlertRecover/AlertRecover */ "components/AlertRecover/AlertRecover").then(__webpack_require__.bind(null, /*! @/components/AlertRecover/AlertRecover.vue */ 166)) return __webpack_require__.e(/*! import() | components/AlertRecover/AlertRecover */ "components/AlertRecover/AlertRecover").then(__webpack_require__.bind(null, /*! @/components/AlertRecover/AlertRecover.vue */ 182))
} }
} }
} catch (e) { } catch (e) {
...@@ -246,7 +246,6 @@ var _default = ...@@ -246,7 +246,6 @@ var _default =
onShow: function onShow() { onShow: function onShow() {
this.userInfo = {}; this.userInfo = {};
this.getUserInfo(); this.getUserInfo();
console.log(this.$store.state);
if (this.$store.state.selectAccount) { if (this.$store.state.selectAccount) {
this.$store.commit('refreshSelectAccount', false); this.$store.commit('refreshSelectAccount', false);
this.toast('账号切换成功'); this.toast('账号切换成功');
...@@ -332,7 +331,7 @@ var _default = ...@@ -332,7 +331,7 @@ var _default =
} else if (index === 2) { } else if (index === 2) {
this.$router.push('IntegralDetail'); this.$router.push('IntegralDetail');
} else if (index === 3) { } else if (index === 3) {
this.$router.push('WebView');
} }
}, },
setting: function setting() { setting: function setting() {
......
unpackage/dist/dev/mp-weixin/pages/order/order.js
...@@ -98,7 +98,7 @@ var components ...@@ -98,7 +98,7 @@ var components
try { try {
components = { components = {
uniLoadMore: function() { uniLoadMore: function() {
return Promise.all(/*! import() | uni_modules/uni-load-more/components/uni-load-more/uni-load-more */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue */ 155)) return Promise.all(/*! import() | uni_modules/uni-load-more/components/uni-load-more/uni-load-more */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue */ 171))
} }
} }
} catch (e) { } catch (e) {
...@@ -195,6 +195,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default = ...@@ -195,6 +195,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
// //
// //
// //
//
var _default = var _default =
{ {
data: function data() { data: function data() {
...@@ -207,21 +208,29 @@ var _default = ...@@ -207,21 +208,29 @@ var _default =
statusText: { statusText: {
100: '待兑换', 200: '兑换成功', 300: '兑换失败' }, 100: '待兑换', 200: '兑换成功', 300: '兑换失败' },
page: 1 }; page: 1,
isLogin: true };
}, },
onLoad: function onLoad() { onLoad: function onLoad() {
}, },
onPullDownRefresh: function onPullDownRefresh() {
console.log('下拉刷新');
},
onReachBottom: function onReachBottom() { onReachBottom: function onReachBottom() {
this.getList(); this.getList();
}, },
onShow: function onShow() {
this.isLogin = this.$store.state.isLogin;
},
onTabItemTap: function onTabItemTap() { onTabItemTap: function onTabItemTap() {
if (!this.$store.state.isLogin) { if (!this.$store.state.isLogin) {
this.$router.push('Login'); this.$router.push('Login');
return;
} }
this.orderLists = []; this.orderLists = [];
this.page = 1; this.page = 1;
this.loadingType = 'more'; this.loadingType = 'loading';
this.getList(); this.getList();
}, },
methods: { methods: {
...@@ -242,6 +251,7 @@ var _default = ...@@ -242,6 +251,7 @@ var _default =
_this.page++; _this.page++;
} }
} else { } else {
_this.loadingType = 'noMore';
_this.toast(res.message); _this.toast(res.message);
} }
}); });
...@@ -250,7 +260,21 @@ var _default = ...@@ -250,7 +260,21 @@ var _default =
this.$router.push('OrderDetail', { 'orderId': item.orderSn }); this.$router.push('OrderDetail', { 'orderId': item.orderSn });
}, },
goCoupon: function goCoupon(item) { goCoupon: function goCoupon(item) {
this.$router.push('Coupon', { 'orderId': item.orderSn }); this.$router.push('Coupon', { 'orderId': item.orderSn, 'cardIsAllUnlock': item.cardIsAllUnlock });
} },
watch: {
isLogin: function isLogin(newVal, oldVal) {
console.log(newVal, oldVal);
if (!oldVal && newVal) {
this.orderLists = [];
this.page = 1;
this.loadingType = 'loading';
this.getList();
}
if (oldVal && !newVal) {
this.orderLists = [];
}
} } };exports.default = _default; } } };exports.default = _default;
/***/ }), /***/ }),
......
unpackage/dist/dev/mp-weixin/pages/order/order.wxss
...@@ -97,13 +97,20 @@ page{ ...@@ -97,13 +97,20 @@ page{
font-weight: bolder; font-weight: bolder;
color: #252525; color: #252525;
} }
.container .order-list .item .line.data-v-127632e4 {
margin-top: 32rpx;
height: 2rpx;
width: 100%;
background-color: #F5F5F5;
content: ' ';
}
.container .order-list .item .btn.data-v-127632e4 { .container .order-list .item .btn.data-v-127632e4 {
width: 654rpx; width: 654rpx;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
} }
.container .order-list .item .btn .btn-item.data-v-127632e4 { .container .order-list .item .btn .btn-item.data-v-127632e4 {
margin-top: 40rpx; margin-top: 32rpx;
height: 62rpx; height: 62rpx;
width: 176rpx; width: 176rpx;
border-radius: 32rpx; border-radius: 32rpx;
...@@ -121,11 +128,13 @@ page{ ...@@ -121,11 +128,13 @@ page{
color: #686868; color: #686868;
} }
.container .empty.data-v-127632e4 { .container .empty.data-v-127632e4 {
padding: 432rpx 136rpx 0; padding: 400rpx 136rpx 0;
text-align: center;
} }
.container .empty .empty-img.data-v-127632e4 { .container .empty .empty-img.data-v-127632e4 {
height: 280rpx; margin: 0 auto;
width: 480rpx; height: 300rpx;
width: 394rpx;
} }
.container .empty .empty-text.data-v-127632e4 { .container .empty .empty-text.data-v-127632e4 {
font-size: 28rpx; font-size: 28rpx;
......
unpackage/dist/dev/mp-weixin/pagesA/AlertToLogin/AlertToLogin.json
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarBackgroundColor": "#FFFFFF",
"usingComponents": { "usingComponents": {
"alert": "/components/Alert/Alert" "alert": "/components/Alert/Alert"
} }
......
unpackage/dist/dev/mp-weixin/pagesA/GoodSkuList/GoodSkuList.json
{ {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF",
"usingComponents": { "usingComponents": {
"uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more" "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more"
} }
......
unpackage/dist/dev/mp-weixin/pagesA/GoodSkuList/GoodSkuList.wxss
page{
background-color: #f5f5f5;
}
@charset "UTF-8"; @charset "UTF-8";
/** /**
* 这里是uni-app内置的常用样式变量 * 这里是uni-app内置的常用样式变量
...@@ -32,15 +37,14 @@ ...@@ -32,15 +37,14 @@
.layout .list.data-v-1f43812e { .layout .list.data-v-1f43812e {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 6rpx 12rpx; padding: 0 24rpx;
} }
.layout .list .item.data-v-1f43812e { .layout .list .item.data-v-1f43812e {
display: flex; display: flex;
flex-direction: row;
background: #ffffff; background: #ffffff;
padding: 20rpx 20rpx; padding: 24rpx;
border-radius: 16rpx; border-radius: 16rpx;
margin: 12rpx 0; margin-top: 24rpx;
} }
.layout .list .item .img.data-v-1f43812e { .layout .list .item .img.data-v-1f43812e {
width: 200rpx; width: 200rpx;
...@@ -56,8 +60,8 @@ ...@@ -56,8 +60,8 @@
.layout .list .item .item-rigth .item-title.data-v-1f43812e { .layout .list .item .item-rigth .item-title.data-v-1f43812e {
font-size: 28rpx; font-size: 28rpx;
color: #333333; color: #333333;
height: 58rpx; height: 80rpx;
line-height: 28rpx; line-height: 40rpx;
overflow: hidden; overflow: hidden;
min-inline-size: 2; min-inline-size: 2;
line-clamp: 2; line-clamp: 2;
...@@ -67,7 +71,7 @@ ...@@ -67,7 +71,7 @@
.layout .list .item .item-rigth .item-brand.data-v-1f43812e { .layout .list .item .item-rigth .item-brand.data-v-1f43812e {
background: rgba(255, 5, 32, 0.03); background: rgba(255, 5, 32, 0.03);
border-radius: 4rpx; border-radius: 4rpx;
border: 1rpx solid #ff0520; border: 2rpx solid #ff0520;
font-size: 22rpx; font-size: 22rpx;
color: #ff0520; color: #ff0520;
margin-top: 12rpx; margin-top: 12rpx;
......
unpackage/dist/dev/mp-weixin/pagesA/SetPwd/SetPwd.json
{ {
"navigationBarTitleText": "设置支付密码", "navigationBarTitleText": "设置支付密码",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF",
"usingComponents": {} "usingComponents": {}
} }
\ No newline at end of file
unpackage/dist/dev/mp-weixin/pagesA/VertifyPhone/VertifyPhone.json
{ {
"navigationBarTitleText": "验证手机号", "navigationBarTitleText": "验证手机号",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF",
"usingComponents": {} "usingComponents": {}
} }
\ No newline at end of file
unpackage/dist/dev/mp-weixin/pagesA/VertifyPhone/VertifyPhone.wxml
<view class="layout data-v-652dd10b"><view class="first-line data-v-652dd10b">请完成以下认证</view><view class="sencond-line data-v-652dd10b">{{"请输入"+phone+"收到的短信验证码"}}</view><view class="code-layout data-v-652dd10b"><input class="input data-v-652dd10b" placeholder="请输入短信验证码" type="number" maxlength="8" data-event-opts="{{[['input',[['__set_model',['','code','$event',[]]]]]]}}" value="{{code}}" bindinput="__e"/><text data-event-opts="{{[['tap',[['getCode']]]]}}" class="vertify-code data-v-652dd10b" bindtap="__e">{{verifyCode}}</text></view><view data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="{{['data-v-652dd10b',code.length>0?'submit1':'submit']}}" bindtap="__e">下一步</view></view> <view class="layout data-v-652dd10b"><view class="first-line data-v-652dd10b">请完成以下认证</view><view class="sencond-line data-v-652dd10b">{{"请输入"+phone+"收到的短信验证码"}}</view><view class="code-layout data-v-652dd10b"><input class="input data-v-652dd10b" placeholder="请输入短信验证码" placeholder-style="color:#999999;font-weight:400" type="number" maxlength="8" data-event-opts="{{[['input',[['__set_model',['','code','$event',[]]]]]]}}" value="{{code}}" bindinput="__e"/><text data-event-opts="{{[['tap',[['getCode']]]]}}" class="vertify-code data-v-652dd10b" bindtap="__e">{{verifyCode}}</text></view><view data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" class="{{['data-v-652dd10b',code.length>0?'submit1':'submit']}}" bindtap="__e">下一步</view></view>
\ No newline at end of file \ No newline at end of file
unpackage/dist/dev/mp-weixin/pagesA/VertifyPhone/VertifyPhone.wxss
...@@ -33,21 +33,19 @@ ...@@ -33,21 +33,19 @@
font-size: 36rpx; font-size: 36rpx;
font-weight: bolder; font-weight: bolder;
color: #333333; color: #333333;
line-height: 48rpx;
margin: 80rpx 49rpx 0 49rpx; margin: 80rpx 49rpx 0 49rpx;
} }
.layout .sencond-line.data-v-652dd10b { .layout .sencond-line.data-v-652dd10b {
font-size: 26rpx; font-size: 26rpx;
color: #333333; color: #333333;
line-height: 48rpx; margin: 24rpx 49rpx 0 49rpx;
margin: 29rpx 49rpx 0 49rpx;
} }
.layout .code-layout.data-v-652dd10b { .layout .code-layout.data-v-652dd10b {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin: 29rpx 49rpx 0 49rpx; margin: 119rpx 49rpx 0 49rpx;
border-bottom: solid 2rpx #ff0520; border-bottom: solid 2rpx #ff0520;
padding-bottom: 30rpx; padding-bottom: 30rpx;
} }
......
unpackage/dist/dev/mp-weixin/pagesA/coupon/coupon.json
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "white",
"usingComponents": { "usingComponents": {
"uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more", "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more",
"alert-select-status": "/components/AlertSelectStatus/AlertSelectStatus", "alert-select-status": "/components/AlertSelectStatus/AlertSelectStatus",
......
unpackage/dist/dev/mp-weixin/pagesA/coupon/coupon.wxss
...@@ -151,6 +151,7 @@ page{ ...@@ -151,6 +151,7 @@ page{
margin-right: 16rpx; margin-right: 16rpx;
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
flex-shrink: 0;
} }
.container .list .coupon-content .coupon-big.data-v-5c3582aa { .container .list .coupon-content .coupon-big.data-v-5c3582aa {
flex: 1; flex: 1;
...@@ -170,6 +171,9 @@ page{ ...@@ -170,6 +171,9 @@ page{
width: 100%; width: 100%;
height: 120rpx; height: 120rpx;
z-index: -1; z-index: -1;
background-color: #999999;
border-top-left-radius: 16rpx;
border-top-right-radius: 16rpx;
} }
.container .list .coupon-content .coupon-big .goods-info .left.data-v-5c3582aa { .container .list .coupon-content .coupon-big .goods-info .left.data-v-5c3582aa {
display: flex; display: flex;
...@@ -262,15 +266,16 @@ page{ ...@@ -262,15 +266,16 @@ page{
} }
.container .empty.data-v-5c3582aa { .container .empty.data-v-5c3582aa {
padding: 100rpx 136rpx 0; padding: 100rpx 136rpx 0;
text-align: center;
} }
.container .empty .empty-img.data-v-5c3582aa { .container .empty .empty-img.data-v-5c3582aa {
height: 280rpx; height: 300rpx;
width: 480rpx; width: 394rpx;
} }
.container .empty .empty-text.data-v-5c3582aa { .container .empty .empty-text.data-v-5c3582aa {
font-size: 28rpx; font-size: 28rpx;
color: #BFBFBF; color: #BFBFBF;
margin-top: 48rpx; margin-top: 24rpx;
width: 480rpx; width: 480rpx;
text-align: center; text-align: center;
} }
......
unpackage/dist/dev/mp-weixin/pagesA/goods/goods.js
...@@ -96,13 +96,13 @@ var components ...@@ -96,13 +96,13 @@ var components
try { try {
components = { components = {
goodsSelect: function() { goodsSelect: function() {
return __webpack_require__.e(/*! import() | components/goodsSelect/goodsSelect */ "components/goodsSelect/goodsSelect").then(__webpack_require__.bind(null, /*! @/components/goodsSelect/goodsSelect.vue */ 173)) return __webpack_require__.e(/*! import() | components/goodsSelect/goodsSelect */ "components/goodsSelect/goodsSelect").then(__webpack_require__.bind(null, /*! @/components/goodsSelect/goodsSelect.vue */ 189))
}, },
previewImages: function() { previewImages: function() {
return __webpack_require__.e(/*! import() | components/previewImages/previewImages */ "components/previewImages/previewImages").then(__webpack_require__.bind(null, /*! @/components/previewImages/previewImages.vue */ 180)) return __webpack_require__.e(/*! import() | components/previewImages/previewImages */ "components/previewImages/previewImages").then(__webpack_require__.bind(null, /*! @/components/previewImages/previewImages.vue */ 196))
}, },
setPwdAlert: function() { setPwdAlert: function() {
return __webpack_require__.e(/*! import() | components/setPwdAlert/setPwdAlert */ "components/setPwdAlert/setPwdAlert").then(__webpack_require__.bind(null, /*! @/components/setPwdAlert/setPwdAlert.vue */ 187)) return __webpack_require__.e(/*! import() | components/setPwdAlert/setPwdAlert */ "components/setPwdAlert/setPwdAlert").then(__webpack_require__.bind(null, /*! @/components/setPwdAlert/setPwdAlert.vue */ 203))
} }
} }
} catch (e) { } catch (e) {
...@@ -347,7 +347,7 @@ var _default = { ...@@ -347,7 +347,7 @@ var _default = {
return newContent; return newContent;
}, },
clickCustomer: function clickCustomer() { clickCustomer: function clickCustomer() {
this.$wxCustomer(); this.$router.push('WebView');
}, },
goSubmit: function goSubmit(e) { goSubmit: function goSubmit(e) {
if (!this.$store.state.isLogin) { if (!this.$store.state.isLogin) {
......
unpackage/dist/dev/mp-weixin/pagesA/goods/goods.json
{ {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF",
"usingComponents": { "usingComponents": {
"goods-select": "/components/goodsSelect/goodsSelect", "goods-select": "/components/goodsSelect/goodsSelect",
"preview-images": "/components/previewImages/previewImages", "preview-images": "/components/previewImages/previewImages",
......
unpackage/dist/dev/mp-weixin/pagesA/goods/goods.wxml
<view class="content data-v-5f9ddc4e"><scroll-view class="scroll-view data-v-5f9ddc4e" style="{{'height:'+(scrollViewHeight-safeAreaBottom+'px')+';'}}" scroll-top="{{scrollTop}}" scroll-y="true" scroll-into-view="{{introductionId}}" data-event-opts="{{[['scroll',[['scroll',['$event']]]]]}}" bindscroll="__e"><view class="carousel data-v-5f9ddc4e"><swiper data-event-opts="{{[['change',[['swiperChange',['$event']]]]]}}" class="swiper data-v-5f9ddc4e" bindchange="__e"><block wx:for="{{goods.image}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item class="data-v-5f9ddc4e"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e" class="data-v-5f9ddc4e"><image class="good-image data-v-5f9ddc4e" src="{{item}}" mode="aspectFill"></image></view></swiper-item></block></swiper><block wx:if="{{indictorLength>0}}"><view class="indictor data-v-5f9ddc4e"><text class="indictor-txt data-v-5f9ddc4e">{{currentPosition+" / "+indictorLength}}</text></view></block></view><view class="good-info data-v-5f9ddc4e"><view class="goods-info-left data-v-5f9ddc4e"><view class="good-price-share data-v-5f9ddc4e"><view class="good-price data-v-5f9ddc4e"><text class="sail-price data-v-5f9ddc4e">{{goods.skuDetail.sellingPrice}}<text class="icon data-v-5f9ddc4e">积分</text></text></view></view><view class="good-title data-v-5f9ddc4e">{{''+goods.skuDetail.skuName+''}}</view></view></view><view class="good-attr data-v-5f9ddc4e"><view data-event-opts="{{[['tap',[['showSkuDialog',['$event']]]]]}}" class="good-attr-rule data-v-5f9ddc4e" bindtap="__e"><text class="attr-name data-v-5f9ddc4e">已选</text><text class="data-v-5f9ddc4e">:</text><text class="attrs data-v-5f9ddc4e">{{goods.skuDetail.denomination}}</text><image class="right-row data-v-5f9ddc4e" src="../../static/arrow-right.png"></image></view><view class="good-attr-rule data-v-5f9ddc4e"><text class="attr-name data-v-5f9ddc4e">购买限制</text><text class="data-v-5f9ddc4e">:</text><text class="attrs data-v-5f9ddc4e">{{goods.skuDetail.validityType}}</text></view></view><view class="good-introduction-top data-v-5f9ddc4e"><image class="good-introduction-line data-v-5f9ddc4e" src="../../static/goods-left.png" mode></image><text class="good-introduction-txt data-v-5f9ddc4e">商品介绍</text><image class="good-introduction-line data-v-5f9ddc4e" src="../../static/goods-right.png" mode></image></view><view class="good-introduction data-v-5f9ddc4e" id="good-introduction"><rich-text class="rich-text data-v-5f9ddc4e" nodes="{{$root.m0}}"></rich-text></view></scroll-view><view class="good-detail-bottom data-v-5f9ddc4e"><view data-event-opts="{{[['tap',[['goHome',['$event']]]]]}}" class="function-area data-v-5f9ddc4e" bindtap="__e"><image class="function-icon data-v-5f9ddc4e" src="../../static/goods-home.png"></image><text class="function-txt data-v-5f9ddc4e">首页</text></view><view data-event-opts="{{[['tap',[['clickCustomer']]]]}}" class="function-area data-v-5f9ddc4e" bindtap="__e"><image class="function-icon data-v-5f9ddc4e" src="../../static/goods-customer.png"></image><text class="function-txt data-v-5f9ddc4e">客服</text></view><view data-event-opts="{{[['tap',[['showSkuDialog',['$event']]]]]}}" class="exchange data-v-5f9ddc4e" bindtap="__e"><text class="exchange-txt data-v-5f9ddc4e">立即兑换</text></view></view><goods-select data-custom-hidden="{{!(showSku)}}" vue-id="35f1aa4d-1" goods="{{goods}}" closeName="showSku" data-event-opts="{{[['^certain',[['goSubmit']]]]}}" bind:certain="__e" class="data-v-5f9ddc4e" bind:__l="__l"></goods-select><block wx:if="{{showPreviewImages}}"><preview-images vue-id="35f1aa4d-2" picList="{{goods.image}}" current="{{currentPosition}}" indicatorDots="true" class="data-v-5f9ddc4e" bind:__l="__l"></preview-images></block><set-pwd-alert data-custom-hidden="{{!(showPwdAlert)}}" vue-id="35f1aa4d-3" closeName="showPwdAlert" class="data-v-5f9ddc4e" bind:__l="__l"></set-pwd-alert></view> <view class="content data-v-5f9ddc4e"><scroll-view class="scroll-view data-v-5f9ddc4e" style="{{'height:'+(scrollViewHeight-safeAreaBottom+'px')+';'}}" scroll-top="{{scrollTop}}" scroll-y="true" scroll-into-view="{{introductionId}}" data-event-opts="{{[['scroll',[['scroll',['$event']]]]]}}" bindscroll="__e"><view class="carousel data-v-5f9ddc4e"><swiper data-event-opts="{{[['change',[['swiperChange',['$event']]]]]}}" class="swiper data-v-5f9ddc4e" bindchange="__e"><block wx:for="{{goods.image}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item class="data-v-5f9ddc4e"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e" class="data-v-5f9ddc4e"><image class="good-image data-v-5f9ddc4e" src="{{item}}" mode="aspectFill"></image></view></swiper-item></block></swiper><block wx:if="{{indictorLength>0}}"><view class="indictor data-v-5f9ddc4e"><text class="indictor-txt data-v-5f9ddc4e">{{currentPosition+" / "+indictorLength}}</text></view></block></view><view class="good-info data-v-5f9ddc4e"><view class="goods-info-left data-v-5f9ddc4e"><view class="good-price-share data-v-5f9ddc4e"><view class="good-price data-v-5f9ddc4e"><text class="sail-price data-v-5f9ddc4e">{{goods.skuDetail.sellingPrice}}<text class="icon data-v-5f9ddc4e">积分</text></text></view></view><view class="good-title data-v-5f9ddc4e">{{''+goods.skuDetail.skuName+''}}</view></view></view><view class="good-attr data-v-5f9ddc4e"><view data-event-opts="{{[['tap',[['showSkuDialog',['$event']]]]]}}" class="good-attr-rule data-v-5f9ddc4e" bindtap="__e"><text class="attr-name data-v-5f9ddc4e">已      选</text><text class="data-v-5f9ddc4e">:</text><text class="attrs data-v-5f9ddc4e">{{goods.skuDetail.denomination}}</text><image class="right-row data-v-5f9ddc4e" src="../../static/arrow-right.png"></image></view><view class="good-attr-rule data-v-5f9ddc4e" style="border:none;"><text class="attr-name data-v-5f9ddc4e">购买限制</text><text class="data-v-5f9ddc4e">:</text><text class="attrs data-v-5f9ddc4e">{{goods.skuDetail.validityType}}</text></view></view><view class="good-introduction-top data-v-5f9ddc4e"><image class="good-introduction-line data-v-5f9ddc4e" src="../../static/goods-left.png" mode></image><text class="good-introduction-txt data-v-5f9ddc4e">商品介绍</text><image class="good-introduction-line data-v-5f9ddc4e" src="../../static/goods-right.png" mode></image></view><view class="good-introduction data-v-5f9ddc4e" id="good-introduction"><rich-text class="rich-text data-v-5f9ddc4e" nodes="{{$root.m0}}"></rich-text></view></scroll-view><view class="good-detail-bottom data-v-5f9ddc4e"><view data-event-opts="{{[['tap',[['goHome',['$event']]]]]}}" class="function-area data-v-5f9ddc4e" bindtap="__e"><image class="function-icon data-v-5f9ddc4e" src="../../static/goods-home.png"></image><text class="function-txt data-v-5f9ddc4e">首页</text></view><view data-event-opts="{{[['tap',[['clickCustomer']]]]}}" class="function-area data-v-5f9ddc4e" bindtap="__e"><image class="function-icon data-v-5f9ddc4e" src="../../static/goods-customer.png"></image><text class="function-txt data-v-5f9ddc4e">客服</text></view><view data-event-opts="{{[['tap',[['showSkuDialog',['$event']]]]]}}" class="exchange data-v-5f9ddc4e" bindtap="__e"><text class="exchange-txt data-v-5f9ddc4e">立即兑换</text></view></view><goods-select data-custom-hidden="{{!(showSku)}}" vue-id="35f1aa4d-1" goods="{{goods}}" closeName="showSku" data-event-opts="{{[['^certain',[['goSubmit']]]]}}" bind:certain="__e" class="data-v-5f9ddc4e" bind:__l="__l"></goods-select><block wx:if="{{showPreviewImages}}"><preview-images vue-id="35f1aa4d-2" picList="{{goods.image}}" current="{{currentPosition}}" indicatorDots="true" class="data-v-5f9ddc4e" bind:__l="__l"></preview-images></block><set-pwd-alert data-custom-hidden="{{!(showPwdAlert)}}" vue-id="35f1aa4d-3" closeName="showPwdAlert" class="data-v-5f9ddc4e" bind:__l="__l"></set-pwd-alert></view>
\ No newline at end of file \ No newline at end of file
unpackage/dist/dev/mp-weixin/pagesA/goods/goods.wxss
...@@ -129,7 +129,6 @@ ...@@ -129,7 +129,6 @@
} }
.content .scroll-view .good-info .goods-info-left.data-v-5f9ddc4e { .content .scroll-view .good-info .goods-info-left.data-v-5f9ddc4e {
width: 606rpx; width: 606rpx;
padding-top: 8rpx;
} }
.content .scroll-view .good-info .goods-info-left .good-price-share.data-v-5f9ddc4e { .content .scroll-view .good-info .goods-info-left .good-price-share.data-v-5f9ddc4e {
display: flex; display: flex;
...@@ -170,7 +169,7 @@ ...@@ -170,7 +169,7 @@
.content .scroll-view .good-info .goods-info-left .good-title.data-v-5f9ddc4e { .content .scroll-view .good-info .goods-info-left .good-title.data-v-5f9ddc4e {
font-size: 30rpx; font-size: 30rpx;
font-weight: bolder; font-weight: bolder;
line-height: 48rpx; line-height: 42rpx;
margin-top: 10rpx; margin-top: 10rpx;
max-lines: 3; max-lines: 3;
line-clamp: 3; line-clamp: 3;
...@@ -225,11 +224,20 @@ ...@@ -225,11 +224,20 @@
} }
.content .scroll-view .good-attr .good-attr-rule .attr-name.data-v-5f9ddc4e { .content .scroll-view .good-attr .good-attr-rule .attr-name.data-v-5f9ddc4e {
font-size: 28rpx; font-size: 28rpx;
color: #848689; color: #333333;
line-height: 40rpx; line-height: 40rpx;
white-space: nowrap; white-space: nowrap;
width: 120rpx; width: 120rpx;
text-align-last: justify; text-align: justify;
text-align-last: center;
-moz-text-align-last: center;
}
.content .scroll-view .good-attr .good-attr-rule .attr-name.data-v-5f9ddc4e::after {
content: ' ';
width: 100%;
height: 0;
display: inline-block;
visibility: hidden;
} }
.content .scroll-view .good-attr .good-attr-rule .attr-name-icon.data-v-5f9ddc4e { .content .scroll-view .good-attr .good-attr-rule .attr-name-icon.data-v-5f9ddc4e {
font-size: 28rpx; font-size: 28rpx;
...@@ -244,7 +252,7 @@ ...@@ -244,7 +252,7 @@
} }
.content .scroll-view .good-attr .good-attr-rule .right-row.data-v-5f9ddc4e { .content .scroll-view .good-attr .good-attr-rule .right-row.data-v-5f9ddc4e {
width: 12rpx; width: 12rpx;
height: 24rpx; height: 20rpx;
position: absolute; position: absolute;
right: 48rpx; right: 48rpx;
} }
......
unpackage/dist/dev/mp-weixin/pagesA/integralDetail/integralDetail.json
{ {
"navigationBarTitleText": "积分明细", "navigationBarTitleText": "积分明细",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF",
"usingComponents": { "usingComponents": {
"uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more", "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more",
"uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup" "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
......
unpackage/dist/dev/mp-weixin/pagesA/integralDetail/integralDetail.wxml
<view class="layout data-v-7344e0cb"><view class="header data-v-7344e0cb"><view data-event-opts="{{[['tap',[['showTimeSelect',['$event']]]]]}}" class="header-left data-v-7344e0cb" bindtap="__e"><text class="header-time data-v-7344e0cb">{{applyDate}}</text><image class="time-bottom-row data-v-7344e0cb" src="../../static/icon-bottom-row.png"></image></view><view class="header-right data-v-7344e0cb"><text data-event-opts="{{[['tap',[['selectTab',[0]]]]]}}" class="{{['data-v-7344e0cb',currentTab==0?'tab-select':'tab-unselect']}}" bindtap="__e">综合</text><text data-event-opts="{{[['tap',[['selectTab',[200]]]]]}}" class="{{['data-v-7344e0cb',currentTab==200?'tab-select':'tab-unselect']}}" bindtap="__e">{{"支出￥"+allConsume}}</text><text data-event-opts="{{[['tap',[['selectTab',[100]]]]]}}" class="{{['data-v-7344e0cb',currentTab==100?'tab-select':'tab-unselect']}}" bindtap="__e">{{"收入￥"+allIncome}}</text></view></view><block wx:if="{{integralList.length>0}}"><view class="list data-v-7344e0cb"><block wx:for="{{integralList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-7344e0cb"><image class="icon data-v-7344e0cb" src="{{item.integral<0?'../../static/integral-use.png':'../../static/integral-income.png'}}"></image><view class="item-right data-v-7344e0cb"><view class="item-right-top data-v-7344e0cb"><view class="item-title data-v-7344e0cb"><text class="item-type data-v-7344e0cb">{{item.tag}}</text><text class="item-name data-v-7344e0cb">{{item.title}}</text><text class="item-count data-v-7344e0cb">{{item.number<=0?'':'*'+item.number}}</text></view><text class="{{['data-v-7344e0cb',item.integral>0?'item-integral-income':'item-integral']}}">{{(item.integral>0?'+':'')+item.integral}}</text></view><view class="item-right-bottom data-v-7344e0cb"><text class="item-time data-v-7344e0cb">{{item.transactionTime}}</text><text class="item-integral-rest data-v-7344e0cb">{{"积分余额： "+item.surplusIntegral}}</text></view><view class="line data-v-7344e0cb"></view></view></view></block><block wx:if="{{integralList.length>0}}"><uni-load-more vue-id="15508cca-1" status="{{loadingType}}" class="data-v-7344e0cb" bind:__l="__l"></uni-load-more></block></view></block><block wx:else><block wx:if="{{!isLoading&&integralList.length<=0}}"><view class="empty data-v-7344e0cb"><image class="empty-icon data-v-7344e0cb" src="../../static/integral-empty-icon.png"></image><text class="empty-desc data-v-7344e0cb">本月暂时没有支出积分哦</text></view></block></block><uni-popup class="pop data-v-7344e0cb vue-ref" vue-id="15508cca-2" type="bottom" background-color="#fff" safeArea="true" data-ref="timeShow" bind:__l="__l" vue-slots="{{['default']}}"><text data-event-opts="{{[['tap',[['selectTime']]]]}}" class="selectTime data-v-7344e0cb" bindtap="__e">确定</text><picker-view class="picker-view data-v-7344e0cb" indicator-style="{{indicatorStyle}}" value="{{value}}" data-event-opts="{{[['change',[['bindChange',['$event']]]]]}}" bindchange="__e"><picker-view-column class="data-v-7344e0cb"><block wx:for="{{years}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-7344e0cb">{{item+"年"}}</view></block></picker-view-column><picker-view-column class="data-v-7344e0cb"><block wx:for="{{months}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-7344e0cb">{{item+"月"}}</view></block></picker-view-column></picker-view></uni-popup></view> <view class="layout data-v-7344e0cb"><view class="header data-v-7344e0cb"><view data-event-opts="{{[['tap',[['showTimeSelect',['$event']]]]]}}" class="header-left data-v-7344e0cb" bindtap="__e"><text class="header-time data-v-7344e0cb">{{applyDate}}</text><image class="time-bottom-row data-v-7344e0cb" src="../../static/icon-bottom-row.png"></image></view><view class="header-right data-v-7344e0cb"><text data-event-opts="{{[['tap',[['selectTab',[0]]]]]}}" class="{{['data-v-7344e0cb',currentTab==0?'tab-select':'tab-unselect']}}" bindtap="__e">综合</text><text data-event-opts="{{[['tap',[['selectTab',[200]]]]]}}" class="{{['data-v-7344e0cb',currentTab==200?'tab-select':'tab-unselect']}}" bindtap="__e">{{"支出￥"+allConsume}}</text><text data-event-opts="{{[['tap',[['selectTab',[100]]]]]}}" class="{{['data-v-7344e0cb',currentTab==100?'tab-select':'tab-unselect']}}" bindtap="__e">{{"收入￥"+allIncome}}</text></view></view><block wx:if="{{integralList.length>0}}"><view class="list data-v-7344e0cb"><block wx:for="{{integralList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-7344e0cb"><image class="icon data-v-7344e0cb" src="{{item.integral<0?'../../static/integral-use.png':'../../static/integral-income.png'}}"></image><view class="item-right data-v-7344e0cb"><view class="item-right-top data-v-7344e0cb"><view class="item-title data-v-7344e0cb"><text class="item-type data-v-7344e0cb">{{item.tag}}</text><text class="item-name data-v-7344e0cb">{{item.title}}</text><text class="item-count data-v-7344e0cb">{{item.number<=0?'':'*'+item.number}}</text></view><text class="{{['data-v-7344e0cb',item.integral>0?'item-integral-income':'item-integral']}}">{{(item.integral>0?'+':'')+item.integral}}</text></view><view class="item-right-bottom data-v-7344e0cb"><text class="item-time data-v-7344e0cb">{{item.transactionTime}}</text><text class="item-integral-rest data-v-7344e0cb">{{"积分余额： "+item.surplusIntegral}}</text></view><view class="line data-v-7344e0cb"></view></view></view></block><block wx:if="{{integralList.length>0}}"><uni-load-more vue-id="15508cca-1" status="{{loadingType}}" class="data-v-7344e0cb" bind:__l="__l"></uni-load-more></block></view></block><block wx:else><block wx:if="{{!isLoading&&integralList.length<=0}}"><view class="empty data-v-7344e0cb"><image class="empty-icon data-v-7344e0cb" src="/static/integral-empty-icon.png"></image><text class="empty-desc data-v-7344e0cb">本月暂时没有支出积分哦</text></view></block></block><uni-popup class="pop data-v-7344e0cb vue-ref" vue-id="15508cca-2" type="bottom" background-color="#fff" safeArea="true" data-ref="timeShow" bind:__l="__l" vue-slots="{{['default']}}"><text data-event-opts="{{[['tap',[['selectTime']]]]}}" class="selectTime data-v-7344e0cb" bindtap="__e">确定</text><picker-view class="picker-view data-v-7344e0cb" indicator-style="{{indicatorStyle}}" value="{{value}}" data-event-opts="{{[['change',[['bindChange',['$event']]]]]}}" bindchange="__e"><picker-view-column class="data-v-7344e0cb"><block wx:for="{{years}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-7344e0cb">{{item+"年"}}</view></block></picker-view-column><picker-view-column class="data-v-7344e0cb"><block wx:for="{{months}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-7344e0cb">{{item+"月"}}</view></block></picker-view-column></picker-view></uni-popup></view>
\ No newline at end of file \ No newline at end of file
unpackage/dist/dev/mp-weixin/pagesA/integralDetail/integralDetail.wxss
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
width: 90rpx; width: 90rpx;
height: 90rpx; height: 90rpx;
background: #ffffff; background: #ffffff;
border: 2px solid #efefef; border: 2rpx solid #efefef;
border-radius: 50%; border-radius: 50%;
margin-left: 30rpx; margin-left: 30rpx;
} }
......
unpackage/dist/dev/mp-weixin/pagesA/login/login.js
...@@ -145,7 +145,7 @@ __webpack_require__.r(__webpack_exports__); ...@@ -145,7 +145,7 @@ __webpack_require__.r(__webpack_exports__);
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;} // /* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
// //
// //
// //
...@@ -198,7 +198,7 @@ var _default = ...@@ -198,7 +198,7 @@ var _default =
console.log(e); console.log(e);
this.liteLogin(e.detail.code); this.liteLogin(e.detail.code);
}, },
sendCode: function sendCode() {var _params,_this = this; sendCode: function sendCode() {var _this = this;
if (this.phone.length != 11) { if (this.phone.length != 11) {
this.toast('请输入正确的手机号'); this.toast('请输入正确的手机号');
return; return;
...@@ -206,7 +206,7 @@ var _default = ...@@ -206,7 +206,7 @@ var _default =
if (this.time != 300) { if (this.time != 300) {
return; return;
} }
var params = (_params = { 'codeType': '10' }, _defineProperty(_params, "codeType", this.phone), _defineProperty(_params, 'resetToken', 'not'), _params); var params = { 'codeType': '10', 'mobile': this.phone, 'resetToken': 'not' };
this.$net.post('/meta/sms', params).then(function (res) { this.$net.post('/meta/sms', params).then(function (res) {
if (res.code === 200) { if (res.code === 200) {
uni.showToast({ uni.showToast({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment