Commit d66bae15 authored by Facius's avatar Facius

Merge branch 'lwh-dev'

parents 83bb399e 660bdd55
Pipeline #4000 canceled with stages
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<view class="content-view"> <view class="content-view">
<view class="qrcode-view"><image :src="qrcode"></image></view> <view class="qrcode-view"><image :src="qrcode"></image></view>
</view> </view>
<view class="close-view" @click="close"><u-icon name="close"></u-icon></view>
</view> </view>
<view class="btn"> <view class="btn">
<view class="confirm" @click="$u.throttle(handleClickSure, 500)"> <view class="confirm" @click="$u.throttle(handleClickSure, 500)">
...@@ -41,7 +42,7 @@ export default { ...@@ -41,7 +42,7 @@ export default {
}; };
}, },
computed: { computed: {
...mapGetters(['userInfo']), ...mapGetters(['userInfo'])
}, },
methods: { methods: {
open() { open() {
...@@ -64,7 +65,7 @@ export default { ...@@ -64,7 +65,7 @@ export default {
position: relative; position: relative;
.apply-refuse { .apply-refuse {
background-color: $default-color; background-color: $default-color;
background: url('https://static-book.kaying.cc/icon/mine/min-share-haibao.jpg') no-repeat; background: url('https://static-book.kaying.cc/icon/mine/jizhangbaocunhaibao.jpg') no-repeat;
background-position: center top; background-position: center top;
background-size: 100%; background-size: 100%;
width: 620rpx; width: 620rpx;
...@@ -72,21 +73,32 @@ export default { ...@@ -72,21 +73,32 @@ export default {
border-radius: 12rpx; border-radius: 12rpx;
padding: 52rpx 36rpx; padding: 52rpx 36rpx;
position: relative; position: relative;
.close-view {
position: absolute;
right: 36rpx;
top: 20rpx;
font-size: 32rpx;
width: 88rpx;
height: 88rpx;
padding-right: 8rpx;
line-height: 88rpx;
text-align: right;
}
.user { .user {
display: flex; display: flex;
align-items: center; align-items: center;
color: #FFFFFF;
.user-avatar { .user-avatar {
width: 44rpx; width: 44rpx;
height: 44rpx; height: 44rpx;
border-radius: 50%; border-radius: 50%;
background: #FFFFFF; background: #ffffff;
padding: 4rpx; padding: 4rpx;
display: flex; display: flex;
margin-right: 12rpx; margin-right: 12rpx;
} }
.user-avatar-image{ .user-avatar-image {
border-radius: 50%; border-radius: 50%;
} }
} }
...@@ -98,12 +110,13 @@ export default { ...@@ -98,12 +110,13 @@ export default {
transform: translateX(-50%); transform: translateX(-50%);
width: 192rpx; width: 192rpx;
height: 192rpx; height: 192rpx;
background: #FFFFFF; background: #ffffff;
border: 2rpx solid $default-color;
border-radius: 16rpx; border-radius: 16rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.qrcode-view { .qrcode-view {
width: 160rpx; width: 160rpx;
height: 160rpx; height: 160rpx;
......
...@@ -111,13 +111,9 @@ export default { ...@@ -111,13 +111,9 @@ export default {
onLoad(options) {}, onLoad(options) {},
onUnload() {}, onUnload() {},
onReady() { onReady() {
setTimeout(() => {
console.log('handleCanvas-qrcode---onReady', this.qrcode);
}, 1500);
}, },
methods: { methods: {
handleCanvas(url) { handleCanvas(url) {
console.log('handleCanvas-qrcode---', url);
this.qrcode = url; this.qrcode = url;
}, },
handleSave() { handleSave() {
...@@ -214,7 +210,7 @@ export default { ...@@ -214,7 +210,7 @@ export default {
css: { css: {
width: '750rpx', width: '750rpx',
height: '1220rpx', height: '1220rpx',
backgroundImage: 'url(https://static-book.kaying.cc/icon/mine/min-share-haibao.jpg)', backgroundImage: 'url(https://static-book.kaying.cc/icon/mine/jizhangbaocunhaibao.jpg)',
'object-fit': 'fill' 'object-fit': 'fill'
}, },
views: [ views: [
...@@ -226,7 +222,7 @@ export default { ...@@ -226,7 +222,7 @@ export default {
display: 'flex', display: 'flex',
'align-items': 'center', 'align-items': 'center',
fontSize: '24rpx', fontSize: '24rpx',
color: '#ffffff', color: '#333333',
'line-height': '44rpx' 'line-height': '44rpx'
}, },
views: [ views: [
...@@ -257,6 +253,7 @@ export default { ...@@ -257,6 +253,7 @@ export default {
width: '192rpx', width: '192rpx',
height: '192rpx', height: '192rpx',
background: '#FFFFFF', background: '#FFFFFF',
border: '2rpx solid #02A074',
'border-radius': '16rpx', 'border-radius': '16rpx',
display: 'flex', display: 'flex',
'align-items': 'center', 'align-items': 'center',
......
...@@ -489,7 +489,7 @@ export default { ...@@ -489,7 +489,7 @@ export default {
} }
} else { } else {
if (this.form.type === 'TIME') { if (this.form.type === 'TIME') {
if (this.form.normalNumber <= 0 && this.form.overNumber <= 0) { if (this.form.normalNumber <= 0 && this.form.overNumber <= 0&&this.form.rewardAmount<=0) {
flag = false; flag = false;
} }
} else { } else {
...@@ -588,7 +588,7 @@ export default { ...@@ -588,7 +588,7 @@ export default {
type: type.code, type: type.code,
remark, remark,
// 点工 // 点工
normalNumber: normalNumber || 1, normalNumber: normalNumber ,
normalText: normalText || 1, normalText: normalText || 1,
normalType: (normalType && normalType.code) || 'UNIT', normalType: (normalType && normalType.code) || 'UNIT',
overNumber, overNumber,
...@@ -631,7 +631,7 @@ export default { ...@@ -631,7 +631,7 @@ export default {
form.deductText = 1; form.deductText = 1;
} }
this.form = form; this.form = form;
console.log(form); console.log("form",form);
this.setWageList(); this.setWageList();
} catch (e) { } catch (e) {
//TODO handle the exception //TODO handle the exception
......
export const version = "1.0.33" export const version = "1.0.35"
export const baseURL = "/baseapi" export const baseURL = "/baseapi"
export const token = "TOKEN" export const token = "TOKEN"
export const PHONENUMBER = "PHONENUMBER" export const PHONENUMBER = "PHONENUMBER"
......
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