Commit 18df65d1 authored by Morson's avatar Morson
parents 9af987a2 a226fa84
const globalUrl = process.uniEnv || {}
const ucenterApiUrl = globalUrl.ucenterUrl.apiUrl
let certApiFun = function(vm){
let getCertList = async (params = {}) => await vm.$u.get(ucenterApiUrl+'/v1/settled/get-cert-list', params);
const certApi = {
getCertList
}
return certApi
}
module.exports = {
certApiFun
}
\ No newline at end of file
...@@ -10,6 +10,7 @@ import { ...@@ -10,6 +10,7 @@ import {
import {learnApiFun} from "@/common/api/learn.js"; import {learnApiFun} from "@/common/api/learn.js";
import { orderApiFun } from "@/common/api/order.js"; import { orderApiFun } from "@/common/api/order.js";
import {assessmentApiFun} from"@/common/api/assessment.js" import {assessmentApiFun} from"@/common/api/assessment.js"
import {certApiFun} from"@/common/api/cert.js"
let apiFun = function(vm) { let apiFun = function(vm) {
let commonApi = commonApiFun(vm); let commonApi = commonApiFun(vm);
let settledApi = settledApiFun(vm) let settledApi = settledApiFun(vm)
...@@ -17,13 +18,15 @@ let apiFun = function(vm) { ...@@ -17,13 +18,15 @@ let apiFun = function(vm) {
let learnApi=learnApiFun(vm) let learnApi=learnApiFun(vm)
let assessmentApi = assessmentApiFun(vm) let assessmentApi = assessmentApiFun(vm)
let orderApi=orderApiFun(vm) let orderApi=orderApiFun(vm)
let certApi=certApiFun(vm)
let apiUrl = { let apiUrl = {
...commonApi, ...commonApi,
...settledApi, ...settledApi,
...cloudApi, ...cloudApi,
...learnApi, ...learnApi,
...orderApi, ...orderApi,
...assessmentApi ...assessmentApi,
...certApi
} }
return apiUrl return apiUrl
} }
......
...@@ -75,6 +75,11 @@ let orderApiFun = function(vm){ ...@@ -75,6 +75,11 @@ let orderApiFun = function(vm){
*/ */
let getWatermark = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token + '/photo/watermark', params); let getWatermark = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token + '/photo/watermark', params);
/**
* 保存师傅水印
*/
let saveWatermark = async (params = {}) => await vm.$u.post(prefix + vm.vuex_token + '/photo/watermark', params);
/** /**
* 获取师傅开放可选时间段 * 获取师傅开放可选时间段
*/ */
...@@ -144,6 +149,7 @@ let orderApiFun = function(vm){ ...@@ -144,6 +149,7 @@ let orderApiFun = function(vm){
orderStandard, orderStandard,
saveImage, saveImage,
getWatermark, getWatermark,
saveWatermark,
openTimerange, openTimerange,
contactTime, contactTime,
checkRejectable, checkRejectable,
......
...@@ -73,6 +73,12 @@ ...@@ -73,6 +73,12 @@
}, },
methods: { methods: {
selectUpload(){ selectUpload(){
if (this.imgList.length === 10) {
return this.$refs.uToast.show({
title: '图片已超出最大数量',
type: 'error',
})
}
// 弹窗展示 // 弹窗展示
this.maskShow = true this.maskShow = true
}, },
......
...@@ -64,5 +64,7 @@ ...@@ -64,5 +64,7 @@
} }
.input-item{ .input-item{
background: #F4F5F7; background: #F4F5F7;
border-radius: 12rpx;
padding-left: 20rpx;
} }
</style> </style>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<view class="line-view"></view> <view class="line-view"></view>
<view class="reason-view" v-if="showReason"><text class="reason-text">未通过原因:</text> <view class="reason-view" v-if="showReason"><text class="reason-text">未通过原因:</text>
<text>{{orderData.auditResults.remark}}</text> <text v-for="(item, index) in orderData.auditResults" :key="index">{{item}}</text>
</view> </view>
<view class="bottom-view"> <view class="bottom-view">
<view> <view>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
return return
} }
let path = '' let path = ''
if(photo.tempPath.origin && photo.waterSetting && photo.waterSetting.has_origin){ if(photo.tempPath.origin){
// 保存原图到本地 // 保存原图到本地
path = photo.tempPath.origin path = photo.tempPath.origin
let result = await this.saveLocal(path) let result = await this.saveLocal(path)
...@@ -73,10 +73,10 @@ ...@@ -73,10 +73,10 @@
}) })
} }
} }
// if(photo.currentItem){
// photo.currentItem.imageList.unshift(photo.tempPath.mixWater)
// }
if(photo.currentItem){
photo.currentItem.imageList.unshift(photo.tempPath.mixWater)
}
// if(photo.productList && photo.productList[photo.topIndex]){ // if(photo.productList && photo.productList[photo.topIndex]){
// const topArr = photo.productList[photo.topIndex] // const topArr = photo.productList[photo.topIndex]
// if(topArr[photo.itemIndex]){ // if(topArr[photo.itemIndex]){
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
photo.currentItemLength = 10 photo.currentItemLength = 10
this.continuePhoto() this.continuePhoto()
// 完成本项 // 完成本项
this.$emit('finish') //this.$emit('finish')
}, },
// 确认图片 // 确认图片
continuePhoto() { continuePhoto() {
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
}, },
submitFile() { submitFile() {
const photo = getApp().globalData.photo const photo = getApp().globalData.photo
photo.currentItemLength = photo.currentItemLength + 1 if (photo.currentItemLength < 10) photo.currentItemLength = photo.currentItemLength + 1
uni.hideLoading() uni.hideLoading()
// 当前项的图片显示 // 当前项的图片显示
// 拍照项张数目增加 等于10张 // 拍照项张数目增加 等于10张
......
...@@ -9,20 +9,20 @@ ...@@ -9,20 +9,20 @@
<text class="itemTitle">保存原图</text> <text class="itemTitle">保存原图</text>
<text class="itemNotice">拍照后另保存一张无水印的图片</text> <text class="itemNotice">拍照后另保存一张无水印的图片</text>
</view> </view>
<switch class="itemSwitch" :checked="result['has_origin']" @change="handleOrigineChange" color="#007AFF" /> <switch class="itemSwitch" :checked="result['hasOrigin']" @change="handleOrigineChange" color="#007AFF" />
</view> </view>
<view class="itemView" v-if="showTitleSwitch"> <view class="itemView" v-if="showTitleSwitch">
<view class="itemTitleView" @click="itemClick({},-1)"> <view class="itemTitleView" @click="itemClick({},-1)">
<text class="itemTitle">水印标题</text> <text class="itemTitle">水印标题</text>
<text class="itemNotice">{{result['lower_right']['title_text'] || '点击可编辑更改'}}</text> <text class="itemNotice">{{result['lowerLeft']['title'] || '点击可编辑更改'}}</text>
</view> </view>
<switch class="itemSwitch" disabled :checked="result['lower_right']['title_text'] != ''" <switch class="itemSwitch" disabled :checked="result['lowerLeft']['title'] != ''"
@click="handleClickTitleSwitch" color="#007AFF" /> @click="handleClickTitleSwitch" color="#007AFF" />
</view> </view>
<view class="itemView" v-for="(item,ikey) in itemList" :key="ikey"> <view class="itemView" v-for="(item,ikey) in itemList" :key="ikey">
<view class="itemTitleView" @click="itemClick(item,ikey)"> <view class="itemTitleView" @click="itemClick(item,ikey)">
<text class="itemTitle">{{item['watemark_text'] || '自定义' + (ikey + 1)}}</text> <text class="itemTitle">{{item['watemarkText'] || '自定义' + (ikey + 1)}}</text>
<text class="itemNotice">{{item['watemark_value'] || '点击可编辑更改'}}</text> <text class="itemNotice">{{item['watemarkValue'] || '点击可编辑更改'}}</text>
</view> </view>
<switch class="itemSwitch" :checked="item['enable']" @change="itemChange(item, ikey)" color="#007AFF" /> <switch class="itemSwitch" :checked="item['enable']" @change="itemChange(item, ikey)" color="#007AFF" />
</view> </view>
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
<view class="inputBackView"> <view class="inputBackView">
<view class="ph-pop-left-view"> <view class="ph-pop-left-view">
<view class="leftInputView"> <view class="leftInputView">
<input class="leftInput" type="text" v-model="currenItem['watemark_text']" <input class="leftInput" type="text" v-model="currenItem['watemarkText']"
@input="leftInput()" :disabled="currenItem.type === 'title_text'" placeholder="请输入" @input="leftInput()" :disabled="currenItem.type === '备注'" placeholder="请输入"
maxlength="10" /> maxlength="10" />
</view> </view>
<view class="ph-pop-tip-view" v-if="showTipLeft">*必填项</view> <view class="ph-pop-tip-view" v-if="showTipLeft">*必填项</view>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<view class="ph-pop-mid-view">:</view> <view class="ph-pop-mid-view">:</view>
<view> <view>
<view class="rightInputView"> <view class="rightInputView">
<input class="rightInput" type="text" v-model="currenItem['watemark_value']" <input class="rightInput" type="text" v-model="currenItem['watemarkValue']"
@input="rightInput()" placeholder="请输入内容" maxlength="30" /> @input="rightInput()" placeholder="请输入内容" maxlength="30" />
</view> </view>
<view class="ph-pop-tip-view" v-if="showTipRight">*必填项</view> <view class="ph-pop-tip-view" v-if="showTipRight">*必填项</view>
...@@ -72,14 +72,14 @@ ...@@ -72,14 +72,14 @@
isPopShow: false, isPopShow: false,
icon_close_new: '', icon_close_new: '',
result: { result: {
has_origin: true, hasOrigin: true,
lower_right: { lowerLeft: {
body: [] body: []
} }
}, },
currenItem: { currenItem: {
'watemark_text': '', 'watemarkText': '',
'watemark_value': '' 'watemarkValue': ''
}, },
editingItem: {}, editingItem: {},
showTipLeft: false, showTipLeft: false,
...@@ -89,10 +89,11 @@ ...@@ -89,10 +89,11 @@
}, },
computed: { computed: {
itemList() { itemList() {
if (this.result['lower_right']) { console.log(this.result)
var arr = this.result['lower_right']['body'] if (this.result['lowerLeft']) {
var arr = this.result['lowerLeft']['body']
return arr.filter((item) => { return arr.filter((item) => {
return item.watemark_type === '备注' return item.watemarkType === '备注'
}) })
} else { } else {
return [] return []
...@@ -100,7 +101,7 @@ ...@@ -100,7 +101,7 @@
}, },
showTitleSwitch() { showTitleSwitch() {
return this.result['lower_right'].hasOwnProperty('title_text') return this.result['lowerLeft'].hasOwnProperty('title')
}, },
customStyleCancel() { customStyleCancel() {
return { return {
...@@ -122,54 +123,43 @@ ...@@ -122,54 +123,43 @@
getApp().trackPage('水印设置页') getApp().trackPage('水印设置页')
const globalData = getApp().globalData const globalData = getApp().globalData
this.icon_close_new = globalData.icon_close_new this.icon_close_new = globalData.icon_close_new
this.systemId = globalData.photo.currentItem.systemId this.systemId = globalData.photo.currentItem.partnerCompanyId
this.getItemList() this.getItemList()
}, },
methods: { methods: {
getItemList: function() { getItemList: function() {
// this.systemId = '79550af260555cc20afb34156c94b32c' // 测试数据
this.loading = true this.loading = true
this.$u.api.getUserWatermark({ this.$u.api.getWatermark({partnerCompanyId:this.systemId}).then(res => {
'token': this.vuex_token, if (res.code == 200) {
'system_id': this.systemId this.result = res.data
}).then(res => { } else {
if (res && res.result) { uni.showToast({title: res.data.message})
if(res.result.error_code){
uni.showToast({title: res.result.error_msg})
}else{
this.result = res.result
}
}else{
uni.showToast({title: '网络异常'})
} }
this.loading = false this.loading = false
}) })
}, },
saveUserWatermark: function() { saveUserWatermark: function() {
this.loading = true this.loading = true
this.$u.api.saveUserWatermark({ this.$u.api.saveWatermark(this.result).then(res=>{
'token': this.vuex_token, if(res.code === 200){
'watermark': this.result uni.showToast({title:'保存成功'})
}).then(res => { getApp().globalData.photo.waterSetting = this.result
if (res.result.code == true) { this.$emit("changeWatermark", this.result);
const photo = getApp().globalData.photo
photo.waterSetting = this.result
}else{ }else{
uni.showToast({title: res.result.msg}) uni.showToast({title: res.message})
} }
this.loading = false this.loading = false
}) })
}, },
//保存原图 开关 //保存原图 开关
handleOrigineChange: function(e) { handleOrigineChange: function(e) {
this.result['has_origin'] = !this.result['has_origin'] this.result['hasOrigin'] = !this.result['hasOrigin']
this.saveUserWatermark() this.saveUserWatermark()
}, },
handleClickTitleSwitch: function(e) { handleClickTitleSwitch: function(e) {
var string = this.result['lower_right']['title_text'] ? '水印标题不可关闭' : '请先编辑该自定义项' var string = this.result['lowerLeft']['title'] ? '水印标题不可关闭' : '请先编辑该自定义项'
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: string title: string
...@@ -178,7 +168,7 @@ ...@@ -178,7 +168,7 @@
//自定义 开关 //自定义 开关
itemChange: function(item, ikey) { itemChange: function(item, ikey) {
if (item['watemark_value']) { if (item['watemarkValue']) {
// 修改 // 修改
item['enable'] = !item['enable'] item['enable'] = !item['enable']
this.saveUserWatermark() this.saveUserWatermark()
...@@ -194,9 +184,9 @@ ...@@ -194,9 +184,9 @@
itemClick: function(item, ikey) { itemClick: function(item, ikey) {
if (ikey === -1) { if (ikey === -1) {
this.currenItem = { this.currenItem = {
'watemark_text': '水印标题', 'watemarkText': '水印标题',
'watemark_value': this.result['lower_right']['title_text'], 'watemarkValue': this.result['lowerLeft']['title'],
'type': 'title_text' 'type': '备注'
} }
} else { } else {
this.editingItem = item this.editingItem = item
...@@ -210,7 +200,7 @@ ...@@ -210,7 +200,7 @@
//左侧输入框 //左侧输入框
leftInput: function(e) { leftInput: function(e) {
if (this.currenItem['watemark_text']) { if (this.currenItem['watemarkText']) {
this.showTipLeft = false this.showTipLeft = false
} }
...@@ -218,7 +208,7 @@ ...@@ -218,7 +208,7 @@
//右侧输入框 //右侧输入框
rightInput: function(e) { rightInput: function(e) {
if (this.currenItem['watemark_value']) { if (this.currenItem['watemarkValue']) {
this.showTipRight = false this.showTipRight = false
} }
}, },
...@@ -227,8 +217,8 @@ ...@@ -227,8 +217,8 @@
popCancelClick: function() { popCancelClick: function() {
this.isPopShow = false this.isPopShow = false
this.currenItem = { this.currenItem = {
'watemark_text': '', 'watemarkText': '',
'watemark_value': '' 'watemarkValue': ''
} }
}, },
...@@ -241,22 +231,22 @@ ...@@ -241,22 +231,22 @@
}, },
//自定义弹窗 保存 //自定义弹窗 保存
popSaveClick: function() { popSaveClick: function() {
if (this.currenItem['watemark_text'] && this.currenItem['watemark_value']) { if (this.currenItem['watemarkText'] && this.currenItem['watemarkValue']) {
this.isPopShow = false this.isPopShow = false
if (this.currenItem.type === 'title_text') { if (this.currenItem.type === '备注') {
this.result['lower_right']['title_text'] = this.currenItem['watemark_value'] this.result['lowerLeft']['title'] = this.currenItem['watemarkValue']
} else { } else {
this.editingItem['watemark_text'] = this.currenItem['watemark_text'] this.editingItem['watemarkText'] = this.currenItem['watemarkText']
this.editingItem['watemark_value'] = this.currenItem['watemark_value'] this.editingItem['watemarkValue'] = this.currenItem['watemarkValue']
this.editingItem['enable'] = true this.editingItem['enable'] = true
} }
this.saveUserWatermark() this.saveUserWatermark()
} else { } else {
// 提示 // 提示
if (!this.currenItem['watemark_text']) { if (!this.currenItem['watemarkText']) {
this.showTipLeft = true this.showTipLeft = true
} }
if (!this.currenItem['watemark_value']) { if (!this.currenItem['watemarkValue']) {
this.showTipRight = true this.showTipRight = true
} }
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
src="/static/photo/icon-switch.png"></cover-image> src="/static/photo/icon-switch.png"></cover-image>
<cover-image @click="setCameraInfo('flash')" class="icon" mode="aspectFit" <cover-image @click="setCameraInfo('flash')" class="icon" mode="aspectFit"
:src="'/static/photo/icon-light-' + cameraInfo.flash +'.png'"></cover-image> :src="'/static/photo/icon-light-' + cameraInfo.flash +'.png'"></cover-image>
<cover-image v-if="currentItem.system_id" @click="changeType(3)" class="icon" mode="aspectFit" <cover-image v-if="currentItem.partnerCompanyId" @click="changeType(3)" class="icon" mode="aspectFit"
src="/static/photo/icon-setting.png"></cover-image> src="/static/photo/icon-setting.png"></cover-image>
</cover-view> </cover-view>
</cover-view> </cover-view>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</view> </view>
</view> </view>
<photo-preview v-if="showType === 2" @changeType="changeType" @finish="finish" /> <photo-preview v-if="showType === 2" @changeType="changeType" @finish="finish" />
<photo-setting v-if="showType === 3" @changeType="changeType" /> <photo-setting v-if="showType === 3" @changeType="changeType" @changeWatermark="changeWatermark"/>
</view> </view>
</template> </template>
...@@ -128,10 +128,10 @@ ...@@ -128,10 +128,10 @@
titleTxt() { titleTxt() {
const waterSetting = this.waterSetting const waterSetting = this.waterSetting
let txt = '' let txt = ''
if (!waterSetting || !waterSetting.lower_right) { if (!waterSetting || !waterSetting.lowerLeft) {
return '' return ''
} }
txt = waterSetting.lower_right && waterSetting.lower_right.title_text || '' txt = waterSetting.lowerLeft && waterSetting.lowerLeft.title || ''
return txt return txt
}, },
settingTxtArr() { settingTxtArr() {
...@@ -144,17 +144,17 @@ ...@@ -144,17 +144,17 @@
let settingTxtArr = [] let settingTxtArr = []
const typeArr = ['经度', '纬度', '地址', '时间'] const typeArr = ['经度', '纬度', '地址', '时间']
const waterSetting = this.waterSetting const waterSetting = this.waterSetting
if (!waterSetting || !waterSetting.lower_right || !waterSetting.lower_right.body) { if (!waterSetting || !waterSetting.lowerLeft || !waterSetting.lowerLeft.body) {
return arr return arr
} }
const settingArr = waterSetting.lower_right.body const settingArr = waterSetting.lowerLeft.body
settingArr.map(item => { settingArr.map(item => {
const idx = typeArr.indexOf(item.watemark_type) const idx = typeArr.indexOf(item.watemarkType)
if (item.enable && (idx > -1 || (item.watemark_value && item.watemark_text))) { if (item.enable && (idx > -1 || (item.watemarkValue && item.watemarkText))) {
if (idx > -1) { if (idx > -1) {
settingTxtArr.push(arr[idx]) settingTxtArr.push(arr[idx])
} else { } else {
settingTxtArr.push(item.watemark_text + ':' + item.watemark_value) settingTxtArr.push(item.watemarkText + ':' + item.watemarkValue)
} }
} }
}) })
...@@ -191,6 +191,9 @@ ...@@ -191,6 +191,9 @@
changeType(type) { changeType(type) {
this.showType = type this.showType = type
}, },
changeWatermark(watermark){
this.waterSetting = watermark
},
updateTime() { updateTime() {
this.waterInfo.date = this.getTime() this.waterInfo.date = this.getTime()
// let timer = setTimeout(() => { // let timer = setTimeout(() => {
......
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
"path": "pages/index/mine", "path": "pages/index/mine",
"style": { "style": {
"navigationBarTitleText": "我的", "navigationBarTitleText": "我的",
"navigationStyle": "custom" "navigationStyle": "custom" ,
"disableScroll": true
} }
}, },
{ {
...@@ -155,6 +156,30 @@ ...@@ -155,6 +156,30 @@
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom", // 隐藏系统导航栏
"disableScroll": true "disableScroll": true
} }
},
{
"path": "wallet/index",
"style": {
"navigationBarTitleText": "我的钱包",
"enablePullDownRefresh": false,
"disableScroll": true,
"navigationStyle": "custom", // 隐藏系统导航栏
"navigationBarBackgroundColor":"#F4F5F7"
}
},
{
"path": "cert/list",
"style": {
"navigationBarTitleText": "我的证件",
"navigationStyle":"custom"
}
},
{
"path": "cert/detail",
"style": {
"navigationBarTitleText": "",//证件详情
"navigationStyle":"custom"
}
} }
] ]
}, },
...@@ -458,6 +483,11 @@ ...@@ -458,6 +483,11 @@
"name": "学习 - 首页", //模式名称 "name": "学习 - 首页", //模式名称
"path": "pages/index/learn", //启动页面,必选 "path": "pages/index/learn", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到 "query": "" //启动参数,在页面的onLoad函数里面得到
},
{
"name": "我的 - 我的证件 - 列表", //模式名称
"path": "pages/mine/cert/list", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到
} }
] ]
} }
......
<template> <template>
<view class="mine-view"> <view class="mine-view">
<image class="header-image" mode="widthFix" :src="imageUrl + 'wodebeijing.png'"></image> <image class="header-image" mode="widthFix" :src="wodebeijingImage"></image>
<u-navbar :is-back="false" :background="{ background: 'transparent' }" :border-bottom="false"> <u-navbar :is-back="false" :background="{ background: 'transparent' }" :border-bottom="false">
<text class="title-view">我的</text> <text class="title-view">我的</text>
</u-navbar> </u-navbar>
<view class="mine-content"> <view class="mine-content">
<view class="header-view"> <view class="header-view">
<view class="head-image"> <view :class="['head-image', {'has-image': info.headImage}]">
<u-avatar :src="headImageUrl" size="142" mode="circle"></u-avatar> <u-avatar :src="headImageUrl" :size="headSize" mode="circle"></u-avatar>
</view> </view>
<view class="header-content"> <view class="header-content">
<view class="name-view">{{name}}</view> <view class="name-view" @click="handleClickName">{{name}}</view>
<view :class="['tel-view', {'active': info.tel}]"> <view :class="['tel-view', {'active': info.tel}]" @click="handleClickTel">
<text>{{tel}}</text> <text>{{telTip}}</text>
<icon name="arrow-left-fill"></icon> <u-icon class="tel-arrow-icon" name="arrow-up-fill"></u-icon>
</view> </view>
</view> </view>
</view> </view>
<view class="list-view"> <view class="list-view">
<u-cell-group> <u-cell-group :border="false">
<view v-for="(item, index) in items" :key="index"> <view v-for="(item, index) in items" :key="index">
<u-cell-item :value="item.value" :border-bottom="false" @click="handleClick(index)"> <u-cell-item :value="item.value" :border-bottom="false" @click="handleClick(index)">
<image slot="icon" :src="imageUrl + item.icon" :style="item.imageStyle"></image> <image slot="icon" :src="imageUrl + item.icon" :style="item.imageStyle"></image>
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
</view> </view>
</u-cell-group> </u-cell-group>
</view> </view>
<view class="u-m-t-20" @click="take"> <!-- <view class="u-m-t-20" @click="take">
<u-cell-group> <u-cell-group>
<u-cell-item icon="setting" title="相机组件测试"></u-cell-item> <u-cell-item icon="setting" title="相机组件测试"></u-cell-item>
</u-cell-group> </u-cell-group>
</view> -->
</view> </view>
</view> <!-- <take-photo v-if="takeStatus" :currentItem="testData" @close="closeTake"></take-photo> -->
<take-photo v-if="takeStatus" :currentItem="testData" @close="closeTake"></take-photo>
</view> </view>
</template> </template>
...@@ -50,21 +50,21 @@ ...@@ -50,21 +50,21 @@
return { return {
serviceTel: '0755-81773817', serviceTel: '0755-81773817',
info: {}, info: {},
pic: 'https://uviewui.com/common/logo.png', // pic: 'https://uviewui.com/common/logo.png',
show: true, // show: true,
takeStatus: false, // takeStatus: false,
testData: { // testData: {
_id: '1', // 规格ID // _id: '1', // 规格ID
system_id: '2', // 系统ID // system_id: '2', // 系统ID
brand_id: '3', // 品牌ID // brand_id: '3', // 品牌ID
classify_id: '4', // 分类ID // classify_id: '4', // 分类ID
images: [ // 拍照要求示意图 // images: [ // 拍照要求示意图
'https://qn-static.banshouhui.com/live_mark.png', // 'https://qn-static.banshouhui.com/live_mark.png',
'https://qn-static.banshouhui.com/live_mark.png', // 'https://qn-static.banshouhui.com/live_mark.png',
'https://qn-static.banshouhui.com/live_mark.png' // 'https://qn-static.banshouhui.com/live_mark.png'
], // ],
main_point: [] // 要点 // main_point: [] // 要点
} // }
} }
}, },
computed: { computed: {
...@@ -116,20 +116,26 @@ ...@@ -116,20 +116,26 @@
name() { name() {
return this.info.name || '点击登录' return this.info.name || '点击登录'
}, },
tel() { telTip() {
return this.info.tel ? '已绑定手机号' : '绑定手机号' return this.info.tel ? '已绑定手机号' : '绑定手机号'
}, },
imageUrl() { imageUrl() {
return process.uniEnv.qn_base_url return process.uniEnv.qn_base_url
}, },
pages() { pages() {
return ['', '', '', '', 'address', '', ''] return ['wallet', '', 'contract', '', 'address', '', '']
}, },
headImageUrl() { headImageUrl() {
return this.info.headImage || this.placeholderImage return this.info.headImage || this.placeholderImage
}, },
wodebeijingImage() {
return this.imageUrl + 'wodebeijing.png'
},
placeholderImage() { placeholderImage() {
return this.imageUrl + 'touxiang.png' return this.imageUrl + 'touxiang.png'
},
headSize() {
return this.info.headImage ? 136 : 144
} }
}, },
onLoad() { onLoad() {
...@@ -137,18 +143,25 @@ ...@@ -137,18 +143,25 @@
}, },
methods: { methods: {
handleClick(index) { handleClick(index) {
console.log('clicked:', index)
uni.navigateTo({ uni.navigateTo({
url: 'pages/mine/' + this.pages[index] url: 'pages/mine/' + this.pages[index] + '/index'
}) })
}, },
take() { handleClickName() {
uni.hideTabBar() console.log('click name')
this.takeStatus = true
}, },
closeTake(img) { handleClickTel() {
console.log(img) console.log('click tel')
this.takeStatus = false },
} // take() {
// uni.hideTabBar()
// this.takeStatus = true
// },
// closeTake(img) {
// console.log(img)
// this.takeStatus = false
// }
} }
} }
</script> </script>
...@@ -156,6 +169,9 @@ ...@@ -156,6 +169,9 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.mine-view { .mine-view {
position: relative; position: relative;
height: 100vh;
overflow: auto;
background-color: #FFFFFF;
.header-image { .header-image {
position: absolute; position: absolute;
...@@ -169,32 +185,57 @@ ...@@ -169,32 +185,57 @@
font-size: 40rpx; font-size: 40rpx;
padding-left: 30rpx; padding-left: 30rpx;
} }
.mine-content {
background-color: #F4F5F7;
.mine-content {
position: relative;
.header-view { .header-view {
padding: 30rpx; padding: 30rpx 30rpx 80rpx 30rpx;
display: flex; display: flex;
align-items: center;
.head-image { .head-image {
width: 142rpx; width: 144rpx;
height: 142rpx; height: 144rpx;
background-color: #FFFFFF;
border-radius: 72rpx;
&.has-image {
border: 4rpx solid #FFFFFF;
}
} }
.header-content { .header-content {
color: #FFFFFF; color: #FFFFFF;
z-index: 0; z-index: 1;
.name-view { margin-left: 24rpx;
.name-view {
font-size: 44rpx;
font-weight: bold;
margin-bottom: 14rpx;
margin-top: 6rpx;
} }
.tel-view { .tel-view {
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 26rpx; border-radius: 26rpx;
color: #2272FF; color: #2272FF;
width: 164rpx; width: 164rpx;
height: 52rpx; height: 52rpx;
font-size: 20rpx;
display: flex;
align-items: center;
justify-content: center;
&.active { &.active {
color: #FFFFFF; color: #FFFFFF;
border: 1rpx bold #FFFFFF; border: 2rpx solid #FFFFFF;
background-color: #2272FF;
}
.tel-arrow-icon {
transform: rotate(90deg);
margin-left: 6rpx;
} }
} }
} }
...@@ -203,6 +244,7 @@ ...@@ -203,6 +244,7 @@
.list-view { .list-view {
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 16rpx 16rpx 0 0; border-radius: 16rpx 16rpx 0 0;
overflow: hidden;
.item-title { .item-title {
font-size: 32rpx; font-size: 32rpx;
...@@ -219,8 +261,7 @@ ...@@ -219,8 +261,7 @@
.line-view { .line-view {
height: 2rpx; height: 2rpx;
background-color: #F4F5F7; background-color: #F4F5F7;
margin-top: 30rpx; margin: 30rpx;
margin-bottom: 30rpx;
} }
} }
} }
......
...@@ -335,6 +335,7 @@ ...@@ -335,6 +335,7 @@
+ "&categoryId=" + item.categoryId + "&categoryId=" + item.categoryId
+ "&orderServiceType=" + item.orderServiceType + "&orderServiceType=" + item.orderServiceType
+ "&inGuaranteePeriod=" + item.inGuaranteePeriod + "&inGuaranteePeriod=" + item.inGuaranteePeriod
+ "&auditResultsId=" + Object.keys(item.auditResults)[0]
}) })
}, },
handleAction(item) { handleAction(item) {
......
<template>
<view class="cert-page">
<u-navbar
back-icon-color="#000000"
:background="background"
title-color="#000"
:border-bottom="false"
title="我的证件"
title-bold="true"
></u-navbar>
<view class="content-cody">
<view class="title">{{ info.type }}</view>
<view class="content" v-for="item in info.url"><image :src="item" mode=""></image></view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
info: {
type: "",
url: null
}
}
},
onLoad() {
var that = this;
const eventChannel = this.getOpenerEventChannel()
eventChannel.on('acceptDataFromCert', function(data) {
try{
let urlArr = data.url.split(',');
that.info.type = data.type;
that.info.url = urlArr;
console.log(urlArr);
}catch(e){}
console.log(that.info);
})
},
}
</script>
<style>
.cert-page {
font-size: 28rpx;
margin: 30rpx;
}
.content-cody {
padding-left: 30rpx;
padding-right: 30rpx;
background-color: #F4F5F7;
border-radius: 12rpx;
}
.title {
font-size: 32rpx;
font-weight: bold;
}
.content {
padding-top: 30rpx;
}
</style>
<template>
<view class="cert-page">
<u-navbar
back-icon-color="#000000"
:background="background"
title-color="#000"
:border-bottom="false"
title="我的证件"
title-bold="true"
></u-navbar>
<view class="content-cody">
<u-cell-group>
<u-cell-item v-for="item in list" :title="item.name" :value="item.isUploadName" :arrow="true"
:value-style="{'color': item.color}" @click="toDetail(item.keyName)">
<u-icon slot="icon" size="32" name="checkmark-circle" :color="item.iconColor"></u-icon>
</u-cell-item>
</u-cell-group>
</view>
</view>
</template>
<script>
export default {
data() {
return {
list: {
id_card: {
name: "身份证",
isUpload: false,
isUploadName: "",
keyName: "id_card",
color: "#999999"
},
electrician_certificate: {
name: "电工证",
isUpload: false,
isUploadName: "",
keyName: "electrician_certificate",
color: "#999999"
},
driver_license: {
name: "驾驶证",
isUpload: false,
isUploadName: "",
keyName: "driver_license",
color: "#999999"
},
driving_license: {
name: "行驶证",
isUpload: false,
isUploadName: "",
keyName: "driving_license",
color: "#999999"
},
vehicle: {
name: "车辆照",
isUpload: false,
isUploadName: "",
keyName: "vehicle",
color: "#999999"
},
high_sky_license: {
name: "高空证",
isUpload: false,
isUploadName: "",
keyName: "high_sky_license",
color: "#999999"
},
refrigeration_license: {
name: "制冷证",
isUpload: false,
isUploadName: "",
keyName: "refrigeration_license",
color: "#999999"
},
business_license: {
name: "营业执照",
isUpload: false,
isUploadName: "",
keyName: "business_license",
color: "#999999"
},
}
}
},
onLoad() {
let that = this;
this.$u.api
.getCertList()
.then((res) => {
if(res.code != 200){
return
}
for(let key in this.list){
let getData = res.data[key];
this.list[key].isUpload = getData.status;
this.list[key].isUploadName = getData.status == 1 ? '已上传' : '未上传';
this.list[key].color = getData.status == 1 ? "#999999" : "#2272FF";
this.list[key].iconColor = getData.status == 1 ? "#2272FF" : "#999999";
this.list[key].data = getData;
}
console.log(this.list);
console.log(res);
}).catch((err) => {
console.log(err);
});
},
methods: {
isUpload(typeBool) {
return typeBool ? '已上传' : '未上传'
},
toDetail(key) {
let data = this.list[key].data;
if(data.status != 1){
return;
}
wx.navigateTo({
url: '/pages/mine/cert/detail',
success: function(res) {
res.eventChannel.emit('acceptDataFromCert', data)
}
});
}
}
}
</script>
<style>
.cert-page {
font-size: 28rpx;
margin: 30rpx;
}
.content-cody {
/* padding-left: 30rpx;
padding-right: 30rpx; */
padding-left: 30rpx;
padding-right: 30rpx;
background-color: #ffffff;
border-radius: 12rpx;
}
.rightBlue {
color: #007AFF;
}
</style>
<template>
<view class="contract">
<u-navbar
title="我的合同"
b:is-back="false"
:background="background"
:border-bottom="false"
></u-navbar>
<view class="content">
<text class="title">合同清单</text>
<view class="jf-currency-class">
<view class="left"> 自营平台技 工入驻签约 合同 </view>
<view class="text1">《自营平台技工入驻签约合同》</view>
<view class="text2">下载时间: 2021.05.06 14:25:00</view>
</view>
<view class="jf-currency-class">
<view class="left">新风机技工入驻签约合同</view>
<view class="text1">《新风机技工入驻签约合同》</view>
<view class="text2">下载时间: 2021.05.06 15:01:48</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
background: {
backgroundColor: "#F4F5F7",
// 导航栏背景图
// background: 'url(https://cdn.uviewui.com/uview/swiper/1.jpg) no-repeat',
// 还可以设置背景图size属性
// backgroundSize: 'cover',
// 渐变色
// backgroundImage: 'linear-gradient(45deg, rgb(28, 187, 180), rgb(141, 198, 63))'
},
};
},
onLoad() {},
methods: {},
};
</script>
<style lang="scss" scoped>
.contract {
width: 100%;
height: 100vh;
background: #f4f5f7;
}
.content {
width: 100%;
height: 100%;
padding: 40rpx 30rpx 0 30rpx;
}
.title {
width: 65px;
height: 16px;
font-size: 16px;
font-family: PingFang-SC-Bold, PingFang-SC;
font-weight: bold;
color: #333333;
line-height: 16px;
}
.jf-currency-class {
width: 100%;
height: 180rpx;
border-radius: 12rpx;
padding-top: 40rpx;
margin-top: 74rpx;
background: #ffffff;
position: relative;
.left {
width: 160rpx;
height: 200rpx;
padding: 30rpx 14rpx 0 14rpx;
position: absolute;
top: -40rpx;
left: 30rpx;
background: url(@/static/photo/hetong.png);
border-radius: 6px;
color: #ffffff;
font-size: 26rpx;
line-height: 38rpx;
font-family: PingFang-SC-Bold, PingFang-SC;
font-weight: bold;
}
.text1 {
font-size: 32rpx;
font-family: PingFang-SC-Bold, PingFang-SC;
font-weight: bold;
color: #2272ff;
margin-left: 208rpx;
}
.text2 {
font-size: 24rpx;
color: #999999;
margin-left: 220rpx;
margin-top: 22rpx;
}
}
.current-img {
width: 100%;
height: 100%;
position: absolute;
}
</style>
\ No newline at end of file
<template>
<view class="wallet-view">
<u-navbar back-icon-color="#333333" background="#F4F5F7" title="我的钱包" titleColor="#333333" :border-bottom="false"></u-navbar>
<image class="header-image" mode="widthFix" :src="qianbaobeijing"></image>
<view class="survey-view">
<view class="survey-top-view">
<view class="survey-top-left">
<view>账户总资产(元)</view>
<view>{{info.totalPayAmount}}</view>
</view>
<view class="survey-top-right">
<u-button>提现</u-button>
</view>
</view>
<view class="survey-bottom-view">
<view v-for="(value, key) in items" :key="key">
<view>{{value}}</view>
<view>{{info[key]}}</view>
</view>
</view>
</view>
<view class="content-view">
<view v-for="(item, index) in lists" :class="['content-list', {'first': index==0}]" :key="index">
<view class="content-list-left">
<image class="content-list-image" :src="item.icon"></image>
<view class="content-list-text">
<view class="content-list-text-title">{{item.title}}</view>
<view>{{item.content}}</view>
</view>
</view>
<view class="content-list-right">
<text class="content-list-right-text">点击查看</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
</view>
<view class="list-view">
</view>
</view>
</template>
<script>
export default {
data() {
return {
info: {
canApplyAmount: 0, // 可提现金额
saveApplyCount: 0, // 已申请提现的支付单数
canApplyCount: 0, // 可申请提现的支付单数
saveAndApplyAmount: 0, // 已申请提现金额
totalPayAmount: 0, // 总共收入
/* 还没对字段名 */
dairuzhang: 0, // 预计待入账
}
}
},
computed: {
lists() {
return [{
title: '结算账单',
content: '展示您已提现的账单信息',
icon: this.imageUrl + 'jiesuan.png'
},{
title: '收入流水',
content: '当前展示最近5条,点击查看全部',
icon: this.imageUrl + 'liushui.png'
}]
},
items() {
return {canApplyAmount:'可提现(元)', dairuzhang:'预计待入账(元)'}
},
imageUrl() {
return process.uniEnv.qn_base_url
},
qianbaobeijing() {
return this.imageUrl + 'qianbaobeijing.png'
},
},
methods: {
}
}
</script>
<style lang="scss" scoped>
.wallet-view {
position: relative;
height: 100vh;
overflow: auto;
background-color: #F4F5F7;
.header-image {
position: absolute;
width: 100%;
margin-left: 4rpx;
margin-top: 10rpx;
}
.survey-view {
position: relative;
height: 400rpx;
margin: 30rpx 30rpx 10rpx 30rpx;
color: #FFFFFF;
padding: 30rpx;
.survey-top-view {
display: flex;
justify-content: space-between;
align-items: flex-end;
.survey-top-left {
}
.survey-top-right {
}
}
.survey-bottom-view {
display: flex;
justify-content: space-between;
}
}
.content-view {
position: relative;
padding: 0 30rpx;
.content-list {
height: 140rpx;
border-radius: 12rpx;
display: flex;
justify-content: space-between;
padding: 30rpx;
background-color: #FFFFFF;
&.first {
margin-bottom: 20rpx;
}
.content-list-left {
display: flex;
.content-list-image {
width: 56rpx;
height: 56rpx;
margin-top: 2rpx;
}
.content-list-text {
font-size: 24rpx;
color: #666666;
margin-left: 20rpx;
.content-list-text-title {
font-size: 32rpx;
color: #333333;
}
}
}
.content-list-right {
color: #2272FF;
font-size: 26rpx;
.content-list-right-text {
margin-right: 4rpx;
}
}
}
}
.list-view {
position: relative;
}
}
</style>
...@@ -122,6 +122,7 @@ ...@@ -122,6 +122,7 @@
categoryId:0, categoryId:0,
orderServiceType:'', orderServiceType:'',
inGuaranteePeriod:'', inGuaranteePeriod:'',
auditResultsId: '',
list: [], list: [],
tabIndex: 0, tabIndex: 0,
scrollTop: 0, //tab标题的滚动条位置 scrollTop: 0, //tab标题的滚动条位置
...@@ -195,6 +196,7 @@ ...@@ -195,6 +196,7 @@
this.categoryId = option.categoryId this.categoryId = option.categoryId
this.orderServiceType = decodeURIComponent(option.orderServiceType) this.orderServiceType = decodeURIComponent(option.orderServiceType)
this.inGuaranteePeriod = option.inGuaranteePeriod this.inGuaranteePeriod = option.inGuaranteePeriod
this.auditResultsId = option.auditResultsId
} else { } else {
this.orderId = 11880091 this.orderId = 11880091
this.categoryId = 1100000214 this.categoryId = 1100000214
...@@ -238,7 +240,7 @@ ...@@ -238,7 +240,7 @@
'font-size': '32rpx', 'font-size': '32rpx',
} }
}, },
show200() { /// 基础信息显示金额输入框 show200() {
return this.form.paymentMethodsType != '03' return this.form.paymentMethodsType != '03'
} }
}, },
...@@ -250,12 +252,29 @@ ...@@ -250,12 +252,29 @@
if (res.code == 200) { if (res.code == 200) {
self.list = res.data.config self.list = res.data.config
self.form = res.data.value || {} self.form = res.data.value || {}
// 异常单处理
if (self.auditResultsId) self.checkCompleteError()
} else { } else {
console.log(res.message, "获取订单完工项目失败!"); console.log(res.message, "获取订单完工项目失败!");
} }
}); });
} }
}, },
checkCompleteError() { // 异常单定位错误项
let self = this
self.list.forEach((panel, panelIndex)=>{
panel.items.forEach((group, groupIndex) =>{
group.items.forEach((ele, eleIndex)=>{
if (ele.fieldsName === self.auditResultsId) {
self.waitHandlerPanelIndex = panelIndex
self.waitHandlerGroupIndex = groupIndex
self.waitHandlerEleIndex = eleIndex
}
})
})
})
this.locationCompleteItem(self.waitHandlerPanelIndex, self.waitHandlerGroupIndex, self.waitHandlerEleIndex)
},
saveComplete(){// 保存完工信息 saveComplete(){// 保存完工信息
let self = this let self = this
let param = {} let param = {}
...@@ -307,7 +326,6 @@ ...@@ -307,7 +326,6 @@
}else if(value&&Array.isArray(value)&&value.length > 0){ }else if(value&&Array.isArray(value)&&value.length > 0){
panelResult.submitted++ panelResult.submitted++
}else if(first){// 记录第一个 为空 并且需要必填的项 用于定位 }else if(first){// 记录第一个 为空 并且需要必填的项 用于定位
console.log(ele)
first = false first = false
self.waitHandlerPanelIndex = panelIndex self.waitHandlerPanelIndex = panelIndex
self.waitHandlerGroupIndex = groupIndex self.waitHandlerGroupIndex = groupIndex
...@@ -387,11 +405,19 @@ ...@@ -387,11 +405,19 @@
if(innerItem.fieldsType ==='multiInput'){ if(innerItem.fieldsType ==='multiInput'){
// 多个输入框的值触发 // 多个输入框的值触发
let key = Object.keys(data.value)[0] let key = Object.keys(data.value)[0]
debugger
this.form[key] = data.value[key] this.form[key] = data.value[key]
}else{ }else{
this.$set(this.form,innerItem.fieldsName,data.value) this.$set(this.form,innerItem.fieldsName,data.value)
} }
if (innerItem.fieldsId == 199) { // 选不需要收款的时候,收款金额修改为非必选
for (var item of this.list[0].items) {
for (var i of item.items) {
if (i.fieldsId == 200) {
i.required = data.value !='03'
}
}
}
}
console.log(this.form) console.log(this.form)
}, },
...@@ -441,6 +467,7 @@ ...@@ -441,6 +467,7 @@
formType = 'location' formType = 'location'
break break
case 'scan': case 'scan':
case 'machine_code':
formType = 'scan' formType = 'scan'
break break
case 'picker': case 'picker':
......
...@@ -177,7 +177,6 @@ ...@@ -177,7 +177,6 @@
self.$u.api.orderStandard(data).then((res) => { self.$u.api.orderStandard(data).then((res) => {
this.loading = false this.loading = false
if (res.code == 200) { if (res.code == 200) {
console.log("===", res.data)
if(res.data && res.data.length > 0){ if(res.data && res.data.length > 0){
let dataList = [] let dataList = []
var flag = false; var flag = false;
...@@ -205,6 +204,7 @@ ...@@ -205,6 +204,7 @@
} }
} }
}) })
console.log("===", dataList)
this.handleData(dataList) this.handleData(dataList)
} }
} else { } else {
...@@ -217,7 +217,6 @@ ...@@ -217,7 +217,6 @@
this.dataList = result this.dataList = result
if (result.length > 0) { if (result.length > 0) {
var item = result[0] var item = result[0]
getApp().globalData.photo.waterSetting = this.userWatermark
this.rightList = item.list this.rightList = item.list
} }
}, },
...@@ -448,7 +447,6 @@ ...@@ -448,7 +447,6 @@
background-color: #FAFAFA; background-color: #FAFAFA;
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
position: fixed;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
z-index: 1; z-index: 1;
...@@ -501,6 +499,6 @@ ...@@ -501,6 +499,6 @@
} }
.scroll-y { .scroll-y {
height: 80vh; height: 73vh;
} }
</style> </style>
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
:send-message-img="sendMessageImg" :send-message-img="sendMessageImg"
:show-message-card="showMessageCard" :show-message-card="showMessageCard"
@getphonenumber="getphonenumber" @getphonenumber="getphonenumber"
@getuserinfo="getuserinfo"
@error="error" @error="error"
@opensetting="opensetting" @opensetting="opensetting"
@launchapp="launchapp" @launchapp="launchapp"
...@@ -324,9 +325,9 @@ export default { ...@@ -324,9 +325,9 @@ export default {
getphonenumber(res) { getphonenumber(res) {
this.$emit('getphonenumber', res); this.$emit('getphonenumber', res);
}, },
// getuserinfo(res) { getuserinfo(res) {
// this.$emit('getuserinfo', res); this.$emit('getuserinfo', res);
// }, },
error(res) { error(res) {
this.$emit('error', res); this.$emit('error', res);
}, },
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
* @property {Boolean} bold 激活选项的字体是否加粗(默认true) * @property {Boolean} bold 激活选项的字体是否加粗(默认true)
* @property {String} bg-color 组件背景颜色,mode为button时有效(默认#eeeeef) * @property {String} bg-color 组件背景颜色,mode为button时有效(默认#eeeeef)
* @property {String} button-color 按钮背景颜色,mode为button时有效(默认#ffffff) * @property {String} button-color 按钮背景颜色,mode为button时有效(默认#ffffff)
* @property {String Number} border-radius 圆角值,单位rpx(默认5)
* @event {Function} change 分段器选项发生改变时触发 * @event {Function} change 分段器选项发生改变时触发
* @example <u-subsection active-color="#ff9900"></u-subsection> * @example <u-subsection active-color="#ff9900"></u-subsection>
*/ */
...@@ -92,12 +91,7 @@ ...@@ -92,12 +91,7 @@
vibrateShort: { vibrateShort: {
type: Boolean, type: Boolean,
default: false default: false
}, }
// 圆角值
borderRadius: {
type: [Number, String],
default: 5
},
}, },
data() { data() {
return { return {
...@@ -111,7 +105,7 @@ ...@@ -111,7 +105,7 @@
}, },
currentIndex: this.current, currentIndex: this.current,
buttonPadding: 3, // mode = button 时,组件的内边距 buttonPadding: 3, // mode = button 时,组件的内边距
// borderRadius: 5, // 圆角值 borderRadius: 5, // 圆角值
firstTimeVibrateShort: true // 组件初始化时,会触发current变化,此时不应震动 firstTimeVibrateShort: true // 组件初始化时,会触发current变化,此时不应震动
}; };
}, },
......
...@@ -2,8 +2,8 @@ module.exports = { ...@@ -2,8 +2,8 @@ module.exports = {
onLoad() { onLoad() {
// 设置默认的转发参数 // 设置默认的转发参数
this.$u.mpShare = { this.$u.mpShare = {
title: '充电桩安装火爆进行中...就等你', // 默认为小程序名称 title: '', // 默认为小程序名称
path: '/pages/index/index', // 默认为当前页面路径 path: '', // 默认为当前页面路径
imageUrl: '' // 默认为当前页面的截图 imageUrl: '' // 默认为当前页面的截图
} }
}, },
......
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