Skip to content

W
wly-APP
Commit a0763dc7 authored by chuan.liu's avatar chuan.liu
Browse files
Options

bug修复

parent cc97cef3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 57 deletions
pages/group-buy/quota-order.nvue
View file @ a0763dc7
......@@ -41,7 +41,7 @@
<view class="text-block title-first">
<text class="middle-date title-first__text">{{index+1}}</text>
</view>
<view class="text-block" v-if="isBigSingleProduct === 'TRUE'"
<view class="text-block" v-if="item.isBigSingleProduct === 'TRUE'"
@click="selectPlanOrder(item,index)">
<text class="middle-date">计划编号</text>
<view class="middle-date-des uni-list picker-year">
......@@ -124,13 +124,17 @@
salesCenterIndex: -1,
planinnerLists: [{
checked: false,
'ZZFLD00002Q_TEXT': '请选择',
"DESCRIPTION": "请选择",
'NET_PRICE': 0,
'NET_VALUE': 0,
'quantity': 0,
'total': 0,
'product_info': {}
'product_info': {},
'isBigSingleProduct': 'FALSE'
}],
HEADINFO: {},
productInitInfo: {},
isBigSingleProduct: "FALSE"
}
},
computed: {
......@@ -248,9 +252,6 @@
INFO
} = res.DATA
// 是否为大单品产品
this.isBigSingleProduct = res.DISPLAY
// let groupOrder = {
// ...this.groupOrder,
// 'INFO': INFO,
......@@ -270,7 +271,8 @@
item = {
...item,
...product,
...ITEM[0]
...ITEM[0],
isBigSingleProduct: res.DISPLAY // 是否为大单品产品
}
}
return item
......@@ -327,7 +329,7 @@
},
// 选择计划类型
selectPlanOrder(product, index, mode = 'inner') {
if (this.isBigSingleProduct === 'TRUE') {
if (product.isBigSingleProduct === 'TRUE') {
uni.navigateTo({
url: `/pages/select-group-plan/select-group-plan?from=quotaOrder&product=${JSON.stringify((product))}&head=${JSON.stringify(this.HEADINFO)}`
});
......@@ -358,13 +360,15 @@
checked: false,
"PRODUCT_ID": "",
"ORDERED_PROD": "",
"DESCRIPTION": "",
'ZZFLD00002Q_TEXT': '请选择',
"DESCRIPTION": "请选择",
"SHORT_TEXT": "",
'NET_PRICE': 0,
'NET_VALUE': 0,
'quantity': 0,
'total': 0,
'product_info': {},
'isBigSingleProduct': 'FALSE'
}
this.planinnerLists.unshift(product)
},
......@@ -376,6 +380,17 @@
this.HEADINFO.ZZFLD000001 = this.selectedSalesCenter.KEY
},
nextStep() {
if (this.planinnerLists.some((item) => {
return item.isBigSingleProduct === 'TRUE' && item.ZZFLD00002Q === ''
})) {
uni.showToast({
title: '计划编号不能为空',
duration: 2000,
icon: 'none'
});
return
}
let groupOrder = {
"baseinfo": this.groupOrder.baseinfo,
'ITEM': this.planinnerLists,
......
pages/login/login.nvue
View file @ a0763dc7
......@@ -12,15 +12,15 @@
placeholder-class='placeholder-text' />
</view>
<view class="password-block" v-show="loginType==='password'">
<input ref="password" class="password" :cursor='cursorNumber' :password="!passwordVisible"
v-model="password" placeholder="请输入密码" placeholder-class='placeholder-text' />
<template v-if="!passwordVisible">
<input class="password" type="password" v-model="password" placeholder="请输入密码"
placeholder-class='placeholder-text' />
<image class="icon-visible" src="../../static/image/visible@3x.png" mode="aspectFit"
@click="handlePasswordVisible"></image>
</template>
<template v-else>
<input class="password" type="text" v-model="password" placeholder="请输入密码"
placeholder-class='placeholder-text' />
<!-- <input class="password" type="text" v-model="password" placeholder="请输入密码"
placeholder-class='placeholder-text' /> -->
<image class="icon-visible" src="../../static/image/invisible@3x.png" mode="aspectFit"
@click="handlePasswordVisible"></image>
</template>
......@@ -57,14 +57,15 @@
export default {
data() {
return {
account: '0050000215',
account: '',
// password: 'DO1tjHPW0Z',
password: 'Wly12345',
password: '',
phone: '',
code: '',
loginType: 'password',
passwordVisible: false,
disabled: false,
cursorNumber: 0
}
},
computed: {
......@@ -111,6 +112,7 @@
// 切换密码可见性
handlePasswordVisible() {
this.passwordVisible = !this.passwordVisible;
this.$refs.password.blur()
},
// 登录
async goLogin() {
......@@ -200,10 +202,6 @@
padding: 0 40rpx;
}
// .status_bar {
// height: var(--status-bar-height);
// }
.top {
display: flex;
flex-direction: column;
......@@ -228,7 +226,7 @@
margin: 100rpx 0 56rpx;
}
/deep/.placeholder-text {
.placeholder-text {
font-size: 34rpx;
color: $wly-palcehold-color;
}
......
pages/no-quota/quota-order.nvue
View file @ a0763dc7
......@@ -122,6 +122,8 @@
salesCenterIndex: -1,
planinnerLists: [{
checked: false,
'DESCRIPTION': "请选择",
'NET_PRICE': 0,
'quantity': 0,
'total': 0,
NET_VALUE: 0,
......@@ -331,7 +333,7 @@
checked: false,
"PRODUCT_ID": "",
"ORDERED_PROD": "",
"DESCRIPTION": "",
"DESCRIPTION": "请选择",
"SHORT_TEXT": "",
'NET_PRICE': 0,
'NET_VALUE': 0,
......
pages/quota/quota-order.nvue
View file @ a0763dc7
......@@ -187,6 +187,12 @@
planoutLists: [],
planinnerLists: [{
checked: false,
"PRODUCT_ID": "",
"ORDERED_PROD": "",
'ZZFLD000005': '请选择',
'DESCRIPTION': "请选择",
"SHORT_TEXT": "",
'NET_PRICE': 0,
'quantity': 0,
'total': 0,
NET_VALUE: 0,
......@@ -198,7 +204,7 @@
}
},
computed: {
...mapState(['quotaOrder', 'userInfo']),
...mapState(['quotaOrder', 'userInfo', 'userBpData']),
intotalComputed() {
let money = 0
this.planinnerLists.length > 0 && this.planinnerLists.forEach((item) => {
......@@ -518,11 +524,20 @@
},
// 新增产品
addPlanout() {
if (this.userBpData.ROLES[0].ROLE_ID === 'WLY001') {
uni.showToast({
title: '配额酒，经销商不能添加行项目',
duration: 2000,
icon: 'none'
});
return
}
let product = {
checked: false,
"PRODUCT_ID": "",
"ORDERED_PROD": "",
"DESCRIPTION": "",
'ZZFLD000005': '请选择',
'DESCRIPTION': "请选择",
"SHORT_TEXT": "",
'NET_PRICE': 0,
'NET_VALUE': 0,
......
pages/select-sale-plan/select-sale-plan.vue
View file @ a0763dc7
......@@ -213,8 +213,8 @@
}, 600);
},
created() {
this.condition.GJAHR = timeFormat(new Date(), 'yyyy')
this.condition.MONAT = timeFormat(new Date(), 'mm')
// this.condition.GJAHR = timeFormat(new Date(), 'yyyy')
// this.condition.MONAT = timeFormat(new Date(), 'mm')
this.getSalesPlanTypes();
this.reset()
this.getSalesPlan(true);
......@@ -436,6 +436,7 @@
}
.picker-block {
height: 96rpx;
flex: 1;
}
......
unpackage/dist/dev/app-plus/app-service.js
View file @ a0763dc7
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/app-view.js
View file @ a0763dc7
......@@ -12622,7 +12622,7 @@ if(false) {}
var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/runtime/api.js */ 13);
exports = ___CSS_LOADER_API_IMPORT___(false);
// Module
exports.push([module.i, "@charset \"UTF-8\";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\n */\n/**\n * 下方引入的为uView UI的集成样式文件，为scss预处理器，其中包含了一些\"u-\"开头的自定义变量\n * 使用的时候，请将下面的一行复制到您的uniapp项目根目录的uni.scss中即可\n * uView自定义的css类名和scss变量，均以\"u-\"开头，不会造成冲突，请放心使用 \n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */\n/* 透明度 */\n/* 文章场景相关 */\n.view[data-v-ea4a94d4] {\n flex-direction: column;\n}\n.header-bg[data-v-ea4a94d4] {\n height: 284rpx;\n margin-top: -88rpx;\n}\n.header-bg-img[data-v-ea4a94d4] {\n width: 750rpx;\n}\n.lists[data-v-ea4a94d4] {\n position: relative;\n flex-direction: column;\n overflow-y: scroll;\n background: #f0f4f5;\n height: 100vh;\n}\n.main[data-v-ea4a94d4] {\n position: relative;\n flex-direction: column;\n margin-top: -164rpx;\n padding: 0 16rpx;\n}\n.middle[data-v-ea4a94d4] {\n background-color: #fff;\n border-radius: 16rpx;\n padding: 32rpx 64rpx 40rpx 48rpx;\n}\n.text-block[data-v-ea4a94d4] {\n display: flex;\n overflow: hidden;\n height: 96rpx;\n margin-bottom: 14rpx;\n border-bottom: 1px solid #f4f5f6;\n}\n.text-block-last[data-v-ea4a94d4] {\n margin-bottom: 0;\n border-bottom: 0;\n}\n.middle-date[data-v-ea4a94d4] {\n flex: 2;\n font-size: 28rpx;\n line-height: 96rpx;\n color: #333;\n margin-bottom: 8rpx;\n}\n.middle-date-des[data-v-ea4a94d4] {\n flex: 3;\n font-size: 28rpx;\n line-height: 96rpx;\n height: 96rpx;\n white-space: nowrap;\n overflow: hidden;\n text-overflow: ellipsis;\n color: #888;\n}\n.picker-year[data-v-ea4a94d4] {\n position: relative;\n border-radius: 4px;\n align-items: center;\n}\n.uni-list-cell[data-v-ea4a94d4] {\n flex: 1;\n}\n.uni-list-cell-db[data-v-ea4a94d4] {\n flex: 1;\n}\n.picker-block[data-v-ea4a94d4] {\n flex: 1;\n}\n.icon-arrow[data-v-ea4a94d4] {\n position: absolute;\n right: 0;\n top: 16px;\n width: 12rpx;\n height: 20rpx;\n z-index: 10;\n}\n.planout-block-lists[data-v-ea4a94d4] {\n display: flex;\n flex-direction: column;\n overflow: hidden;\n}\n.uni-swipe[data-v-ea4a94d4] {\n flex: 1;\n margin-bottom: 26rpx;\n}\n[data-v-ea4a94d4] .uni-swipe_box {\n flex: 1;\n}\n.swipe-right-block[data-v-ea4a94d4] {\n display: flex;\n width: 100rpx;\n justify-content: center;\n align-items: center;\n}\n.swipe-right-block__text[data-v-ea4a94d4] {\n display: inline-block;\n width: 52rpx;\n height: 52rpx;\n border-radius: 50%;\n background-color: #fff;\n}\n.swipe-right-block__active[data-v-ea4a94d4] {\n width: 52rpx;\n height: 52rpx;\n border-radius: 50%;\n background-color: #FF1D32;\n}\n.planout-block[data-v-ea4a94d4] {\n display: flex;\n justify-content: space-between;\n height: 84rpx;\n margin-top: 64rpx;\n margin-bottom: 48rpx;\n padding: 0 24rpx;\n}\n.planout-block-item[data-v-ea4a94d4] {\n flex: 1;\n width: 750rpx;\n margin-bottom: 26rpx;\n}\n.btn[data-v-ea4a94d4] {\n flex: 1;\n height: 92rpx;\n background: #FF1D32;\n border-radius: 46rpx;\n}\n.btn-text[data-v-ea4a94d4] {\n color: #fff;\n font-size: 34rpx;\n}\n.loading-more[data-v-ea4a94d4] {\n flex: 1;\n align-items: center;\n justify-content: center;\n padding-top: 14px;\n padding-bottom: 14px;\n text-align: center;\n}\n.loading-more-text[data-v-ea4a94d4] {\n font-size: 12px;\n color: #999;\n}\n", ""]);
exports.push([module.i, "@charset \"UTF-8\";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\n */\n/**\n * 下方引入的为uView UI的集成样式文件，为scss预处理器，其中包含了一些\"u-\"开头的自定义变量\n * 使用的时候，请将下面的一行复制到您的uniapp项目根目录的uni.scss中即可\n * uView自定义的css类名和scss变量，均以\"u-\"开头，不会造成冲突，请放心使用 \n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */\n/* 透明度 */\n/* 文章场景相关 */\n.view[data-v-ea4a94d4] {\n flex-direction: column;\n}\n.header-bg[data-v-ea4a94d4] {\n height: 284rpx;\n margin-top: -88rpx;\n}\n.header-bg-img[data-v-ea4a94d4] {\n width: 750rpx;\n}\n.lists[data-v-ea4a94d4] {\n position: relative;\n flex-direction: column;\n overflow-y: scroll;\n background: #f0f4f5;\n height: 100vh;\n}\n.main[data-v-ea4a94d4] {\n position: relative;\n flex-direction: column;\n margin-top: -164rpx;\n padding: 0 16rpx;\n}\n.middle[data-v-ea4a94d4] {\n background-color: #fff;\n border-radius: 16rpx;\n padding: 32rpx 64rpx 40rpx 48rpx;\n}\n.text-block[data-v-ea4a94d4] {\n display: flex;\n overflow: hidden;\n height: 96rpx;\n margin-bottom: 14rpx;\n border-bottom: 1px solid #f4f5f6;\n}\n.text-block-last[data-v-ea4a94d4] {\n margin-bottom: 0;\n border-bottom: 0;\n}\n.middle-date[data-v-ea4a94d4] {\n flex: 2;\n font-size: 28rpx;\n line-height: 96rpx;\n color: #333;\n margin-bottom: 8rpx;\n}\n.middle-date-des[data-v-ea4a94d4] {\n flex: 3;\n font-size: 28rpx;\n line-height: 96rpx;\n height: 96rpx;\n white-space: nowrap;\n overflow: hidden;\n text-overflow: ellipsis;\n color: #888;\n}\n.picker-year[data-v-ea4a94d4] {\n position: relative;\n border-radius: 4px;\n align-items: center;\n}\n.uni-list-cell[data-v-ea4a94d4] {\n flex: 1;\n}\n.uni-list-cell-db[data-v-ea4a94d4] {\n flex: 1;\n}\n.picker-block[data-v-ea4a94d4] {\n height: 96rpx;\n flex: 1;\n}\n.icon-arrow[data-v-ea4a94d4] {\n position: absolute;\n right: 0;\n top: 16px;\n width: 12rpx;\n height: 20rpx;\n z-index: 10;\n}\n.planout-block-lists[data-v-ea4a94d4] {\n display: flex;\n flex-direction: column;\n overflow: hidden;\n}\n.uni-swipe[data-v-ea4a94d4] {\n flex: 1;\n margin-bottom: 26rpx;\n}\n[data-v-ea4a94d4] .uni-swipe_box {\n flex: 1;\n}\n.swipe-right-block[data-v-ea4a94d4] {\n display: flex;\n width: 100rpx;\n justify-content: center;\n align-items: center;\n}\n.swipe-right-block__text[data-v-ea4a94d4] {\n display: inline-block;\n width: 52rpx;\n height: 52rpx;\n border-radius: 50%;\n background-color: #fff;\n}\n.swipe-right-block__active[data-v-ea4a94d4] {\n width: 52rpx;\n height: 52rpx;\n border-radius: 50%;\n background-color: #FF1D32;\n}\n.planout-block[data-v-ea4a94d4] {\n display: flex;\n justify-content: space-between;\n height: 84rpx;\n margin-top: 64rpx;\n margin-bottom: 48rpx;\n padding: 0 24rpx;\n}\n.planout-block-item[data-v-ea4a94d4] {\n flex: 1;\n width: 750rpx;\n margin-bottom: 26rpx;\n}\n.btn[data-v-ea4a94d4] {\n flex: 1;\n height: 92rpx;\n background: #FF1D32;\n border-radius: 46rpx;\n}\n.btn-text[data-v-ea4a94d4] {\n color: #fff;\n font-size: 34rpx;\n}\n.loading-more[data-v-ea4a94d4] {\n flex: 1;\n align-items: center;\n justify-content: center;\n padding-top: 14px;\n padding-bottom: 14px;\n text-align: center;\n}\n.loading-more-text[data-v-ea4a94d4] {\n font-size: 12px;\n color: #999;\n}\n", ""]);
// Exports
module.exports = exports;
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