qniao
/
paper-shopkeeper-app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop

devlop
杨阁辉 4 years ago
parent
26889049aa 03334e211f
commit
733bb29155
9 changed files with 168 additions and 77 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      apis/creditManagementApi.js
  2. 71
      pages.json
  3. 4
      pages/add-record/index.vue
  4. 3
      pages/client-detail/equipment-information.vue
  5. 52
      pages/credit-management/index.vue
  6. 2
      pages/mine/index.vue
  7. 93
      pages/trade/quotationList.vue
  8. 4
      static/icon/iconfont.css
  9. BIN
      static/icon/iconfont.ttf

16
apis/creditManagementApi.js
View File

@ -0,0 +1,16 @@
import http from '../utils/http/index.js'
// 添加纸品
export function addPaper(data) {
return http.post({
url: '/base-paper-trading/create/product',
data
})
}
export function getPaperCategory(data) {
return http.get({
url: '/base-paper-trading/get/product/category-list',
data
})
}

71
pages.json
View File

@ -205,41 +205,44 @@
"navigationBarTitleText": "统一第三方页面", "navigationBarTitleText": "统一第三方页面",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},
{
"path": "pages/credit-management/index",
"style": {
"navigationBarTitleText": "征信管理",
"navigationStyle": "custom"
}
},
{
"path": "pages/store-settings/index",
"style": {
"navigationBarTitleText": "店铺设置",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
},
{
"path": "pages/follow-up-records/index",
"style": {
"navigationBarTitleText": "跟进记录"
}
},
{
"path": "pages/add-record/index",
"style": {
"navigationBarTitleText": "新增跟进记录",
"navigationStyle": "custom"
}
},
{
"path": "pages/paper-detail/index",
"style": {
"navigationBarTitleText": "纸商城详情",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
} }
,{
"path" : "pages/store-settings/index",
"style" :
{
"navigationBarTitleText": "店铺设置",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
},
{
"path": "pages/follow-up-records/index",
"style": {
"navigationBarTitleText": "跟进记录"
}
},
{
"path": "pages/add-record/index",
"style": {
"navigationBarTitleText": "新增跟进记录",
"navigationStyle": "custom"
}
}
,{
"path" : "pages/paper-detail/index",
"style" :
{
"navigationBarTitleText": "纸商城详情",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
}
],
],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app", "navigationBarTitleText": "uni-app",

4
pages/add-record/index.vue
View File

@ -30,7 +30,7 @@
<view class="paper-price-image"> <view class="paper-price-image">
<qn-easyinput <qn-easyinput
class="paper-price-textArea gt-height" class="paper-price-textArea gt-height"
:maxlength="200"
:maxlength="500"
:styles="{ disableColor: '#F7F8FA' }" :styles="{ disableColor: '#F7F8FA' }"
v-model="form.remark" v-model="form.remark"
:inputBorder="false" :inputBorder="false"
@ -57,7 +57,7 @@
<view class="location"> <view class="location">
<image class="icon" src="/static/imgs/client-detail/address-icon.png"></image> <image class="icon" src="/static/imgs/client-detail/address-icon.png"></image>
<text class="text">广州市天河区</text> <text class="text">广州市天河区</text>
<uni-icons size="16" type="bottom"></uni-icons>
<!-- <uni-icons size="16" type="bottom"></uni-icons> -->
</view> </view>
</view> </view>

3
pages/client-detail/equipment-information.vue
View File

@ -7,7 +7,8 @@
<view class="desc"> <view class="desc">
<view class="bottom-btn" @tap="dropdownTap(index)"> <view class="bottom-btn" @tap="dropdownTap(index)">
{{dropdownName}} {{dropdownName}}
<uni-icons size="16" type="bottom"></uni-icons>
<!-- <uni-icons custom-prefix="iconfont" type="icon-required" size="16" color="#888888"></uni-icons> -->
<uni-icons size="16" custom-prefix="iconfont" type="m_dow_arrow" color="#888888"></uni-icons>
</view> </view>
<view class="down-box" v-if="item.isShowSelect"> <view class="down-box" v-if="item.isShowSelect">
<view class="row" v-for="(citem, cindex) in dropdownList" :key="cindex" @tap="dropdownItemTap(cindex)"> <view class="row" v-for="(citem, cindex) in dropdownList" :key="cindex" @tap="dropdownItemTap(cindex)">

52
pages/credit-management/index.vue
View File

@ -0,0 +1,52 @@
<template>
<view>
<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="征信管理"></uni-nav-bar>
<view @click="getPaperCategory">category</view>
<view @click="add">add</view>
</view>
</template>
<script>
import { go2, back } from '@/utils/hook.js'
import { addPaper, getPaperCategory } from '@/apis/creditManagementApi.js'
export default {
data() {
return {}
},
methods: {
go2,
back,
getPaperCategory,
add() {
let form = {
brandName: '博汇',
categoryId: 1,
description: '156企业测试纸品',
imgList: ['https://qncloudtest.oss-cn-shenzhen.aliyuncs.com/common/13390214088425427.jpg'],
isMainProduct: true,
manufacturerName: '156纸厂',
name: '156白卡',
otherNote: '没有说明',
sellingProposition: '没有卖点',
shippingNote: '没有送货说明',
skuList: [
{
isPromoting: false,
listPrice: 10000,
minimum: 1,
stock: 100,
stockUnit: 2,
weight: 200
}
],
supplierId: '678289470268772352'
}
addPaper(form).then((res) => {
console.log(res)
})
}
}
}
</script>
<style lang="scss" scoped></style>

2
pages/mine/index.vue
View File

@ -112,7 +112,7 @@
<image class="icon" src="/static/imgs/mine/contract-icon.png"></image> <image class="icon" src="/static/imgs/mine/contract-icon.png"></image>
<text class="label">合同管理</text> <text class="label">合同管理</text>
</view> </view>
<view class="icon-item">
<view class="icon-item" @click="go2('credit-management')">
<image class="icon" src="/static/imgs/mine/credit-icon.png"></image> <image class="icon" src="/static/imgs/mine/credit-icon.png"></image>
<text class="label">征信管理</text> <text class="label">征信管理</text>
</view> </view>

93
pages/trade/quotationList.vue
View File

@ -1,40 +1,45 @@
<template> <template>
<view class="quotation-list"> <view class="quotation-list">
<scroll-list ref="quotationRef" :option="option" @load="quotationUp" @refresh="quotationDown"> <scroll-list ref="quotationRef" :option="option" @load="quotationUp" @refresh="quotationDown">
<view v-for="(item, index) in quotationData" :key="index">
<view v-for="(item, index) in list" :key="index">
<view class="list-border list-title-line"> <view class="list-border list-title-line">
<text class="list-title">广州民族印刷有限公司</text>
<text class="list-title-Subtitle">待报价</text>
<text class="list-title">{{ item.belongEnterpriseName }}</text>
<text class="list-title-Subtitle">{{ item.replyStatus | replyStatusName }}</text>
</view> </view>
<view class="list-border list-info-line"> <view class="list-border list-info-line">
<view class="list-info list-border">
<view class=""><image class="list-image" src="../../static/logo.png" mode=""></image></view>
<view class="list-info list-border" v-for="(subItem, subIndex) in item.itemList" :key="subIndex">
<view class="">
<!-- <image class="list-image" src="../../static/logo.png" mode=""></image> -->
<image class="list-image" :src="subItem.productImg" mode=""></image>
</view>
<view class="list-info-contant"> <view class="list-info-contant">
<view class="list-info-title">金蝶蓝白卡</view>
<view class="list-info-text">白卡纸/金蝶蓝/350g/787*1092/2200张</view>
<view class="list-info-title">{{subItem.brandName}}</view>
<view class="list-info-text">
{{subItem.categoryName}}/{{subItem.paperName}}/{{subItem.gramWeight}}g/{{subItem.length}}*{{subItem.width}}/{{subItem.quantity}}张
</view>
</view> </view>
</view> </view>
<view class="list-info">
<!-- <view class="list-info">
<view class=""><image class="list-image" src="../../static/logo.png" mode=""></image></view> <view class=""><image class="list-image" src="../../static/logo.png" mode=""></image></view>
<view class="list-info-contant"> <view class="list-info-contant">
<view class="list-info-title">金蝶蓝白卡</view> <view class="list-info-title">金蝶蓝白卡</view>
<view class="list-info-text">白卡纸/金蝶蓝/350g/787*1092/2200张</view> <view class="list-info-text">白卡纸/金蝶蓝/350g/787*1092/2200张</view>
</view> </view>
</view>
</view> -->
</view> </view>
<view class="list-border list-bottom-contant"> <view class="list-border list-bottom-contant">
<view> <view>
<text>交货时间：</text> <text>交货时间：</text>
<text>3天</text>
<text>{{item.deliveryDay}}天</text>
</view> </view>
<view> <view>
<text>交货区域：</text> <text>交货区域：</text>
<text>3天</text>
<text>{{item.deliveryArea}}</text>
</view> </view>
<view class="offer-class"> <view class="offer-class">
<view class="offer-width"> <view class="offer-width">
<text>报价截止：</text> <text>报价截止：</text>
<text>3天</text>
<text>{{item.enquiryValidTime}}</text>
</view> </view>
<view><button type="primary" class="offer-btn" @click="offerClick()">报价</button></view> <view><button type="primary" class="offer-btn" @click="offerClick()">报价</button></view>
</view> </view>
@ -76,50 +81,58 @@ export default {
fontSize: '40rpx' fontSize: '40rpx'
}, },
params: { params: {
cooperationState: 0,
latitude: 23.12616,
longitude: 113.38466,
km: 5
asc: '',
desc: '',
// mallSupplierIds: [this.$store.state.supplierInfo.supplierId], // 网关获取供应商ID集合
mallSupplierIds: ['553703427180466176'] // 网关获取供应商ID集合
}, },
pagination: { pagination: {
pageNum: 0, // 初始会执行一次下拉加载 pageNum: 0, // 初始会执行一次下拉加载
pageSize: 10 pageSize: 10
}, },
quotationData: []
}
},
watch: {
params: {
handler(val) {
this.getQuotationQurty()
},
deep: true
list: []
} }
}, },
onLoad(option) {
if (option) {
option.latitude && (this.params.latitude = option.latitude)
option.longitude && (this.params.longitude = option.longitude)
option.km && (this.params.km = option.km)
onLoad(option) {},
filters: {
replyStatusName(status) {
let name = ''
// 供应商端显示报价状态 30128 待报价 30130 已报价 30139 转化订单 30102 已失效
switch (status) {
case 30128:
name = '待报价'
break
case 30130:
name = '已报价'
break
case 30139:
name = '转化订单'
break
case 30102:
name = '已失效'
break
default:
break
}
return name
} }
this.getQuotationQurty()
}, },
methods: { methods: {
// 获取报价列表 // 获取报价列表
getQuotationQurty() { getQuotationQurty() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getEnterpriseList({ ...this.pagination })
getEnterpriseList({ ...this.params, ...this.pagination })
.then(res => { .then(res => {
console.log('获取报价列表', res)
if (res) { if (res) {
if (this.pagination.pageNum == 1) { if (this.pagination.pageNum == 1) {
// this.quotationData = res.records
this.quotationData = []
this.quotationData = [{ name: '111', id: '222' }, { name: '111', id: '222' }]
this.list = res.records
// this.list = []
// this.list = [{ name: '111', id: '222' }, { name: '111', id: '222' }]
} else { } else {
this.quotationData = this.quotationData.concat(res.records)
this.list = this.list.concat(res.records)
} }
console.log('this.quotationData', res)
resolve({ list: this.quotationData, total: res.total })
resolve({ list: this.list, total: res.total })
} }
}) })
.catch(err => { .catch(err => {
@ -133,7 +146,7 @@ export default {
this.pagination.pageNum++ this.pagination.pageNum++
this.getQuotationQurty() this.getQuotationQurty()
.then(({ list, total }) => { .then(({ list, total }) => {
this.$refs.quotationRef.loadSuccess({ list, total })
this.$refs.quotationRef.refreshSuccess({ list, total })
}) })
.catch(() => { .catch(() => {
this.$refs.quotationRef.loadFail() this.$refs.quotationRef.loadFail()
@ -249,6 +262,7 @@ export default {
} }
.offer-class { .offer-class {
display: flex; display: flex;
justify-content: space-between;
} }
.offer-btn { .offer-btn {
width: 150rpx; width: 150rpx;
@ -257,6 +271,7 @@ export default {
border: 2rpx solid #007aff; border: 2rpx solid #007aff;
border-radius: 8rpx; border-radius: 8rpx;
line-height: 60rpx; line-height: 60rpx;
margin-right: 32rpx;
} }
.offer-width { .offer-width {
width: 70%; width: 70%;

4
static/icon/iconfont.css
View File

@ -11,6 +11,10 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-m_dow_arrow:before {
content: "\e600";
}
.icon-required:before { .icon-required:before {
content: "\e60e"; content: "\e60e";
} }

BIN
static/icon/iconfont.ttf
View File

Write Preview
Loading…
Cancel
Save