Skip to content

W
wly-APP
Commit 62c141ca authored by xiangzj's avatar xiangzj
Browse files
Options

7月版本

parent 4e8da62b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3750 additions and 18 deletions
manifest.json
View file @ 62c141ca
......@@ -3,8 +3,8 @@
// "appid" : "__UNI__EDB6A1F",
"appid" : "__UNI__EDB6A1F",
"description" : "订货系统",
"versionName" : "1.1.44",
"versionCode" : "10144",
"versionName" : "1.1.29",
"versionCode" : "10129",
"transformPx" : false,
"app-plus" : {
/* 5+App特有相关 */
......@@ -44,9 +44,11 @@
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY\"/>"
],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
"targetSdkVersion" : ""
},
"ios" : {
"dSYMs" : false,
......
pages.json
View file @ 62c141ca
......@@ -1186,6 +1186,91 @@
"enablePullDownRefresh": false
}
},
{
"path": "pages/loan-query/loan-query",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "transparent",
"titleText": "销售折扣查询",
"autoBackButton": true
}
}
// "enablePullDownRefresh": true
}
},
{
"path": "pages/loan-query/loan-detail",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "transparent",
"titleText": "销售折扣详情",
"autoBackButton": true,
"buttons": [{
"type": "none",
"text": "驳回",
"fontSize": "14px",
"color": "#FF1D32",
"fontWeight": "bold",
"width": "80px"
},
{
"type": "none",
"text": "通过",
"fontSize": "14px",
"color": "#007aff",
"fontWeight": "bold"
}]
}
}
// "enablePullDownRefresh": true
}
},
{
"path": "pages/brand-recommend/brand-recommend",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "#fff",
"titleText": "品牌推荐官",
"autoBackButton": true,
"buttons": [
{
"type": "none",
"text": "删除",
"fontSize": "16px",
"color": "#FF1D32",
"width": "80px"
},
{
"type": "none",
"text": "修改",
"fontSize": "16px",
"color": "rgba(91,189,43, 1)",
"width": "60px"
},
{
"type": "none",
"text": "新增",
"fontSize": "16px",
"color": "rgba(33, 88, 225, 1)",
"width": "80px"
}
]
}
}
}
}
],
"globalStyle": {
......
pages/brand-recommend/brand-recommend.nvue 0 → 100644
View file @ 62c141ca
This diff is collapsed.
pages/brand-recommend/order-item.nvue 0 → 100644
View file @ 62c141ca
<template>
<view class="order view">
<view class="middle view" @click="handleCheck(idx)">
<view class="check-box">
<radio-group>
<label>
<radio :value="cb" :checked="newsItem.checked" />
</label>
</radio-group>
<view class="text-right">
<view class="middle-title">
<text class="middle-title__text">姓名：</text>
<text class="middle-title__text">{{ newsItem.terminal_name }}</text>
</view>
<view class="middle-title">
<text class="middle-title__text">手机号：</text>
<text class="middle-title__text">1212121221</text>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
// #ifdef APP-NVUE
const dom = weex.requireModule('dom');
// #endif
import store from '@/store/index.js';
export default {
props: {
newsItem: {
type: Object,
default: function (e) {
return {};
}
},
idx: {
type: Number
},
isCheck: {
type: Boolean,
default: false
}
},
data() {
return {
ishowDetail: true,
ishowReceiveDetail: false,
receiveInfoHeight: '132',
receiveInfoDetailSize: {},
allFiles: [],
cb: ''
};
},
computed: {
imageStyles() {
return {
width: 64,
height: 64,
border: {
radius: '50%'
}
};
},
receiveInfoHeightComputed() {
console.log(this.receiveInfoHeight - 0, '[][]');
if (this.receiveInfoHeight - 0 === 0) {
const height = this.allFiles.length > 0 ? 485 : 0;
return { minHeight: height + 'px' };
} else {
return {
height: `${this.receiveInfoHeight}px`
};
}
}
},
mounted() {},
methods: {
handleCheck() {
this.$emit('handleCheck', this.idx);
},
handleDetail(item) {
uni.navigateTo({
url: `/pages/loan-query/loan-detail?code=${item.fee_code}`
});
},
click() {
this.$emit('click');
},
close(e) {
e.stopPropagation();
this.$emit('close');
},
handleShowDetail() {
this.ishowDetail = !this.ishowDetail;
},
checkLogistics() {
const num = 'dfb0ebae8103034ccb863d3702e22eb6';
uni.navigateTo({
url: `/pages/logistics/logistics?logisticno=${num}`
});
}
}
};
</script>
<style lang="scss" scoped>
.view {
flex-direction: column;
}
.order {
flex: 1;
background: #ffffff;
border-radius: 20rpx;
// box-shadow: 0px 2px 4px 0px #dbe4ee;
margin-top: 28rpx;
}
.middle {
padding: 26rpx 32rpx;
}
.middle-title {
display: flex;
align-items: center;
margin-bottom: 10rpx;
}
.middle-title__text {
font-weight: 500;
font-size: 28rpx;
color: $text-base-color;
font-family: PingFangSC, PingFangSC-Medium;
}
.icon-car {
width: 13px;
height: 13px;
margin-left: 16rpx;
}
.text-block {
flex: 1;
flex-direction: column;
margin-bottom: 16rpx;
}
.text-block-last {
margin-bottom: 0;
}
.middle-date {
font-size: 28rpx;
color: $text-base-color;
margin-top: 8rpx;
}
.middle-date-des {
font-size: 24rpx;
color: #999;
}
.text-block-box {
display: flex;
// height: 120rpx;
margin-bottom: 16rpx;
justify-content: space-between;
}
.middle-date-right {
display: flex;
align-items: center;
justify-content: flex-end;
text-align: right;
}
.bottom {
padding: 0 50rpx 48rpx;
}
.bottom-nav {
height: 40rpx;
justify-content: flex-end;
align-items: center;
}
.cell-list {
flex-direction: column;
}
.total-amount {
justify-content: end;
}
.check-box {
display: flex;
align-items: center;
}
.text-right{
display: flex;
flex-direction: column;
padding-left: 10rpx;
}
</style>
\ No newline at end of file
pages/brand-recommend/order-page.nvue 0 → 100644
View file @ 62c141ca
This diff is collapsed.
pages/home/home.vue
View file @ 62c141ca
......@@ -175,6 +175,9 @@
</template>
<script>
import {
getDhkDbsl
} from '@/servers/loan.js'
import {
mapState
} from 'vuex'
......@@ -301,8 +304,26 @@
this.queryUnique()
this.pointsAndCashSummary()
// this.getMessageList()
this.getUsercenterNum()
},
methods: {
async getUsercenterNum(){
let params = {
user_bp: this.userInfo.code,
role: "WLY001",
}
let res = await getDhkDbsl(params)
if(res.dbsl - 0 < 1){
uni.removeTabBarBadge({
index:3
})
return
}
uni.setTabBarBadge({
index:3,
text: res.dbsl.toString()
})
},
async getMessageList() {
let params = {
customer: this.userInfo.code,
......
pages/loan-query/loan-detail.nvue 0 → 100644
View file @ 62c141ca
This diff is collapsed.
pages/loan-query/loan-query - 副本 (2).nvue 0 → 100644
View file @ 62c141ca
This diff is collapsed.
pages/loan-query/loan-query - 副本.nvue 0 → 100644
View file @ 62c141ca
This diff is collapsed.
pages/loan-query/loan-query.nvue 0 → 100644
View file @ 62c141ca
This diff is collapsed.
pages/loan-query/order-item.nvue 0 → 100644
View file @ 62c141ca
<template>
<view class="order view">
<view class="top" @click="handleDetail(newsItem)">
<text class="dot" v-if="!newsItem.new_flag && newsItem.state == '0'"></text>
<text class="title-no">{{ newsItem.fee_code }}</text>
<view class="title-info" v-if="newsItem.state_text">
<button class="title-info__status" type="default">
<text class="item-block-btn__text">{{ newsItem.state_text }}</text>
</button>
</view>
</view>
<view class="middle view">
<view class="middle-title" @click="handleDetail(newsItem)">
<text class="middle-title__text flex1">终端：</text>
<text class="middle-title__text flex6">{{ newsItem.terminal_name }}</text>
</view>
<view class="middle-title" @click="handleDetail(newsItem)">
<text class="middle-title__text flex1">产品：</text>
<text class="middle-title__text flex6">{{ newsItem.product_name }}</text>
</view>
<view class="check-box">
<radio-group @change="handleCheck(idx)">
<label v-if="isCheck">
<radio :value="cb" :checked="newsItem.checked" />
</label>
</radio-group>
<view class="total-amount">
<text class="middle-title__text">总金额：</text>
<text class="middle-title__text red">{{ newsItem.total_amount }}</text>
</view>
</view>
</view>
</view>
</template>
<script>
// #ifdef APP-NVUE
const dom = weex.requireModule('dom');
// #endif
import store from '@/store/index.js';
export default {
props: {
newsItem: {
type: Object,
default: function (e) {
return {};
}
},
idx: {
type: Number
},
isCheck: {
type: Boolean,
default: false
}
},
data() {
return {
ishowDetail: true,
ishowReceiveDetail: false,
receiveInfoHeight: '132',
receiveInfoDetailSize: {},
allFiles: [],
cb: ''
};
},
computed: {
imageStyles() {
return {
width: 64,
height: 64,
border: {
radius: '50%'
}
};
},
receiveInfoHeightComputed() {
console.log(this.receiveInfoHeight - 0, '[][]');
if (this.receiveInfoHeight - 0 === 0) {
const height = this.allFiles.length > 0 ? 485 : 0;
return { minHeight: height + 'px' };
} else {
return {
height: `${this.receiveInfoHeight}px`
};
}
}
},
mounted() {},
methods: {
handleCheck() {
this.$emit('handleCheck', this.idx);
},
handleDetail(item) {
uni.navigateTo({
url: `/pages/loan-query/loan-detail?code=${item.fee_code}`
});
},
click() {
this.$emit('click');
},
close(e) {
e.stopPropagation();
this.$emit('close');
},
handleShowDetail() {
this.ishowDetail = !this.ishowDetail;
},
checkLogistics() {
const num = 'dfb0ebae8103034ccb863d3702e22eb6';
uni.navigateTo({
url: `/pages/logistics/logistics?logisticno=${num}`
});
}
}
};
</script>
<style lang="scss" scoped>
.view {
flex-direction: column;
}
.order {
flex: 1;
background: #ffffff;
border-radius: 20rpx;
box-shadow: 0px 2px 4px 0px #dbe4ee;
margin-top: 28rpx;
}
.top {
height: 72rpx;
align-items: center;
justify-content: space-between;
padding: 0 32rpx;
}
.title-no {
font-size: 24rpx;
color: #555555;
margin-left: 50rpx;
}
.title-info {
align-items: center;
}
.title-info__status {
width: 130rpx;
height: 48rpx;
line-height: 48rpx;
background: #f61d30;
font-size: 12px;
color: #fff;
text-align: center;
padding: 0 10rpx;
border: none;
}
.item-block-btn__text {
font-size: 12px;
color: #fff;
}
.middle {
// position: relative;
padding: 26rpx 32rpx;
}
.middle-title {
display: flex;
align-items: center;
margin-bottom: 32rpx;
}
.middle-title__text {
font-weight: 500;
font-size: 28rpx;
color: $text-base-color;
font-family: PingFangSC, PingFangSC-Medium;
}
.icon-car {
width: 13px;
height: 13px;
margin-left: 16rpx;
}
.text-block {
flex: 1;
flex-direction: column;
margin-bottom: 16rpx;
}
.text-block-last {
margin-bottom: 0;
}
.middle-date {
font-size: 28rpx;
color: $text-base-color;
margin-top: 8rpx;
}
.middle-date-des {
font-size: 24rpx;
color: #999;
}
.text-block-box {
display: flex;
// height: 120rpx;
margin-bottom: 16rpx;
justify-content: space-between;
}
.middle-date-right {
display: flex;
align-items: center;
justify-content: flex-end;
text-align: right;
}
.dot {
width: 5px;
height: 5px;
background: #3bdc88;
border-radius: 50%;
margin-top: -4px;
margin-right: 7px;
}
.bottom {
padding: 0 50rpx 48rpx;
}
.bottom-nav {
height: 40rpx;
justify-content: flex-end;
align-items: center;
}
.bottom-nav-arrow {
align-items: center;
}
.arrow-des {
font-size: 24rpx;
color: #999;
}
.icon-arrow {
width: 7px;
height: 4px;
margin-left: 16rpx;
margin-top: 2px;
transition-property: transform;
transition-duration: 0.15s;
transform: rotate(0deg);
}
.icon-arrow-rotate {
transform: rotate(180deg);
}
.bottom-content {
flex-direction: column;
margin-top: 24rpx;
}
.block-detal {
display: flex;
flex-direction: column;
background: #f8f8f8;
border-radius: 20rpx;
padding: 28rpx 32rpx;
margin-bottom: 16rpx;
}
.block-detal-last {
margin-bottom: 32rpx;
}
.block-detal-item {
display: flex;
margin-bottom: 32rpx;
justify-content: space-between;
}
.block-detal-item-last {
margin-bottom: 0;
}
.detal-item-label {
color: #999;
font-size: 24rpx;
}
.detal-item-value {
// flex: 1;
color: #333;
font-size: 28rpx;
}
.detal-item-value2 {
font-size: 24rpx;
// width: 200%;
// flex: 2;
// text-align: left;
}
.detal-item-value3 {
padding-left: 60rpx;
font-size: 24rpx;
width: 300%;
flex: 2;
text-align: right;
}
.receive-info {
position: relative;
display: flex;
flex-direction: column;
margin-top: 40rpx;
min-height: 240rpx;
// padding-bottom: 96rpx;
}
.receive-info-auto {
// height: auto;
}
.detal-item-title {
color: #333;
font-size: 28rpx;
font-weight: 600;
}
.attach-block {
flex-direction: column;
}
.attach-file {
width: 94px;
height: 94px;
margin: 20rpx 20rpx 0 0;
}
.float-btn-block {
position: absolute;
left: 0;
bottom: -2rpx;
z-index: 10;
width: 620rpx;
height: 120rpx;
background-color: #fff;
display: flex;
align-items: center;
justify-content: center;
}
.float-btn {
padding: 0 20px;
height: 60rpx;
border: 0.5px solid #d8d8d9;
border-radius: 32rpx;
display: flex;
align-items: center;
justify-content: center;
}
.float-btn__text {
font-size: 24rpx;
}
.cell-list {
flex-direction: column;
}
.upload-block {
display: flex;
height: 88rpx;
border-radius: 4px;
margin-top: 20rpx;
flex-direction: column;
}
.total-amount {
justify-content: end;
}
.red {
color: #f61d30;
font-weight: 600;
}
.flex1 {
flex: 1;
}
.flex6 {
flex: 6;
}
.dot {
width: 18px;
height: 18px;
line-height: 18px;
background: #ff0f00;
border-radius: 9px;
color: #fff;
font-size: 11px;
text-align: center;
margin: 0;
position: absolute;
}
.check-box {
display: flex;
justify-content: space-between;
}
</style>
\ No newline at end of file
pages/loan-query/order-page.nvue 0 → 100644
View file @ 62c141ca
This diff is collapsed.
pages/login/login.nvue
View file @ 62c141ca
......@@ -212,8 +212,10 @@
title: '加载中'
});
const params ={
"uuid": "f3eea700a3686e47038a4b047af6d934DsRudwTZSRY", //测试环境
// "uuid": "f3eea700a3686e47038a4b047af6d934DsRudwTZSRY", //测试环境
// "uuid": "13a384b65f030d9a0a6636702ca6b0e5ygV3eEOmHBy", //生产环境
// "uuid": "6fd9f0edf0f9ba7835458874f660e70cXvIY7K6wM6E", //新测试环境
"uuid": "66f17cba953444c862cef50a3f58262fv4feQA1ghLm", //新生产环境
"accessToken": this.accessToken
}
try{
......@@ -224,7 +226,8 @@
const parmasObj = {
account: res.accounts[0].account,
idToken: res.accounts[0].idToken,
loginType: 'ystoken'
loginType: 'ystoken',
idp: 4
}
this.goLogin(parmasObj, false)
}else{
......@@ -256,6 +259,7 @@
username: this.account,
password: this.password,
loginType: 'App',
idp: 4
// account: this.account,
// idToken: this.password,
// loginType: 'ystoken'
......
pages/my-purchase/my-purchase.nvue
View file @ 62c141ca
......@@ -58,7 +58,7 @@
</view>
</view>
<view class="empty"></view>
<swiper ref="swiper1" class="tab-box" :current="tabIndex" :duration="300" @change="onswiperchange"
<swiper ref="swiper1" disable-touch='true' class="tab-box" :current="tabIndex" :duration="300" @change="onswiperchange"
@transition="onswiperscroll" @animationfinish="animationfinish" @onAnimationEnd="animationfinish">
<swiper-item class="swiper-item" v-for="(page, index) in tabList" :key="index">
<orderPage :ref="'page' + index" class="page-item" :nid="page.newsid" :conditions='condition'></orderPage>
......
pages/my-purchase/order-item.nvue
View file @ 62c141ca
......@@ -246,8 +246,8 @@
// 获取arraybuffer格式数据
let res = await uni.request({
method: "POST",
//url: `https://crm.wuliangye.com.cn/crm-app/attachmentDownFile?id=`+item.id, //生产
url: `http://221.10.127.60:5000/crm-app/attachmentDownFile?id=`+item.id,
url: `https://crm.wuliangye.com.cn/crm-app/attachmentDownFile?id=`+item.id, //生产
// url: `http://221.10.127.60:5000/crm-app/attachmentDownFile?id=`+item.id,
params: {
id: item.id
},
......
pages/out-web-site/out-web-site.vue
View file @ 62c141ca
......@@ -33,8 +33,8 @@
async getClientByApp(){
const res = await getClientByApp({code: this.userInfo.code})
if(res){
this.src = 'https://yingxiao.wuliangye.com.cn/webroot/login/jxsLogin_test.html?'+res //测试环境
// this.src = 'https://yingxiao.wuliangye.com.cn/webroot/login/jxsLogin.html?'+res //生产环境
// this.src = 'https://yingxiao.wuliangye.com.cn/webroot/login/jxsLogin_test.html?'+res //测试环境
this.src = 'https://yingxiao.wuliangye.com.cn/webroot/login/jxsLogin.html?'+res //生产环境
}else{
uni.showToast({
title: '权限校验不通过',
......
pages/purchase-receive/purchase-receive.nvue
View file @ 62c141ca
......@@ -350,8 +350,8 @@
// 获取arraybuffer格式数据
let res = await uni.request({
method: "POST",
// url: `https://crm.wuliangye.com.cn/crm-app/attachmentDownFile?id=`+item.id, // 生产
url: `http://221.10.127.60:5000/crm-app/attachmentDownFile?id=`+item.id,
url: `https://crm.wuliangye.com.cn/crm-app/attachmentDownFile?id=`+item.id, // 生产
// url: `http://221.10.127.60:5000/crm-app/attachmentDownFile?id=`+item.id,
params: {
id: item.id
},
......@@ -506,8 +506,8 @@
data.tempFilePaths.forEach((item,idx) => {
console.log('idx',data.tempFilePaths[idx],data.tempFiles[idx].file.name)
uni.uploadFile({
// url: `https://crm.wuliangye.com.cn/crm-app/webUpload/ajaxUpload`, //生产
url: `http://221.10.127.60:5000/crm-app/webUpload/ajaxUpload`,
url: `https://crm.wuliangye.com.cn/crm-app/webUpload/ajaxUpload`, //生产
// url: `http://221.10.127.60:5000/crm-app/webUpload/ajaxUpload`,
filePath: data.tempFilePaths[idx],
name: 'file',
formData: {
......
pages/purchase/purchase-list.nvue
View file @ 62c141ca
......@@ -190,7 +190,8 @@
const row = {
...this.checkedArr[0],
availableQty: qtyNum,
availableBot: botNum
availableBot: botNum,
// invoInfoid: this.checkedArr[0].invoId,
}
if(row.availableQty - 0 === 0){
uni.showToast({
......
pages/usercenter/usercenter.nvue
View file @ 62c141ca
......@@ -101,7 +101,22 @@
</view>
<text class="entry-bill-text">终端</text>
</view>
<view class="entry-block" @click="goPage('loan-query')">
<view class="entry-bill">
<image class="entry-bill-icon entry-bill-icon_billing"
src="@/static/image/salesDiscount.png" mode="">
</image>
</view>
<text class="dot" v-if="dhkNum - 0 >0">{{dhkNum}}</text>
<text class="entry-bill-text">销售折扣</text>
</view>
<!-- <view class="entry-block" @click="goPage('brand-recommend')">
<view class="entry-bill">
<image class="entry-bill-icon entry-bill-icon_billing"
src="@/static/image/usercenter_ticketorder@3x.png" mode=""></image>
</view>
<text class="entry-bill-text">品牌推荐官</text>
</view> -->
</view>
<view class="bottom">
<view class="cell-list">
......@@ -124,7 +139,9 @@
import {
mapState
} from 'vuex'
import {
getDhkDbsl
} from '@/servers/loan.js'
import {
apiGetBpPrice
} from '@/servers/common.js'
......@@ -154,6 +171,7 @@
type: 0, // 全部9 代办0 已办2
},
agentNum: 0,
dhkNum: 0
}
},
computed: {
......@@ -168,8 +186,27 @@
onShow() {
this.condition.userId = this.userInfo.code
this.apiGetMissionList()
this.getUsercenterNum()
},
methods: {
async getUsercenterNum(){
let params = {
user_bp: this.userInfo.code,
role: "WLY001",
}
let res = await getDhkDbsl(params)
this.dhkNum = res.dbsl
if(res.dbsl - 0 < 1){
uni.removeTabBarBadge({
index:3
})
return
}
uni.setTabBarBadge({
index:3,
text: res.dbsl.toString()
})
},
async apiGetMissionList(){
const params = {
...this.condition,
......@@ -428,6 +465,7 @@
position: relative;
}
.dot {
top:0;
width: 36rpx;
height: 36rpx;
line-height: 36rpx;
......
servers/loan.js 0 → 100644
View file @ 62c141ca
import apiHelper from './api.helper.js'
/**
*
* @returns {Promise<AxiosResponse<T>>}
*/
export async function getDhk(params) {
const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/get_dhk', params)
return res
}
export async function getDhkById(params) {
const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/get_dhk_by_id', params)
return res
}
export async function getSubmitDhk(params) {
const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/submit_dhk', params)
return res
}
export async function getDhkDbsl(params) {
const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/get_dhk_dbsl', params)
return res
}
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