diff --git a/App.vue b/App.vue
index fd7bdeb..3579f38 100644
--- a/App.vue
+++ b/App.vue
@@ -2,14 +2,18 @@
import { go2 } from '@/utils/hook.js'
import store from '@/store/index.js'
export default {
- onLaunch: function() {
- const token = store.state.qnToken
- if (!token) {
- go2('login')
- }
- },
- onShow: function() {},
- onHide: function() {}
+ onLaunch: function () {
+ const token = store.state.qnToken
+ let flag = uni.getStorageSync('hasLaunch')
+ if (flag && !token) {
+ go2('login')
+ }
+ if (flag && token) {
+ go2('client')
+ }
+ },
+ onShow: function () {},
+ onHide: function () {}
}
@@ -18,12 +22,12 @@ export default {
@import url('./common/css/reset.scss');
@import '@/static/icon/iconfont.css';
page {
- height: 100%;
+ height: 100%;
}
/* uni-dialog标题样式 */
.uni-dialog-title-text {
- font-size: 32rpx !important;
- color: #323233 !important;
- font-weight: 500 !important;
+ font-size: 32rpx !important;
+ color: #323233 !important;
+ font-weight: 500 !important;
}
-
+
diff --git a/apis/commonApi.js b/apis/commonApi.js
index f5e6bd2..66c84f9 100644
--- a/apis/commonApi.js
+++ b/apis/commonApi.js
@@ -99,7 +99,10 @@ export function getVerifyUrl(data = {}) {
* @param {object} data 参数 mallSupplierId
*/
export function getGuaranteeContract(data = {}) {
- return http.post({ url: '/yyt-uec/create/supplier/guarantee-contract?mallSupplierId=' + data.mallSupplierId, data })
+ return http.post({
+ url: `/yyt-uec/create/supplier/guarantee-contract?mallSupplierId=${data.mallSupplierId}&customerEnterpriseId=${data.customerEnterpriseId}`,
+ data
+ })
}
/**
diff --git a/pages/account-management/index.vue b/pages/account-management/index.vue
index 5b7ccd0..7f3f60e 100644
--- a/pages/account-management/index.vue
+++ b/pages/account-management/index.vue
@@ -1,206 +1,210 @@
-
-
-
- 账号管理
-
- 添加账号
-
-
-
-
-
-
-
- {{item.name}}-{{item.title}}
- {{item.mobile}}
-
- 删除账号
-
-
-
-
-
-
- 账号删除后无法在使用系统,请谨慎操作
-
-
-
-
+
+
+
+ 账号管理
+
+ 添加账号
+
+
+
+
+
+
+
+
+ {{ item.name }}-{{ item.title }}
+
+
+ {{ item.mobile }}
+
+
+ 删除账号
+
+
+
+
+
+
+ 账号删除后无法在使用系统,请谨慎操作
+
+
+
+
diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue
index 89402f9..41813b3 100644
--- a/pages/add-paper/index.vue
+++ b/pages/add-paper/index.vue
@@ -201,16 +201,16 @@
纸品图片
-
-
-
-
-
-
-
- 上传图片
-
-
+
+
+
+
+
+
+
+ 上传图片
+
+
-
-
+
@@ -456,7 +456,7 @@ export default {
// }
// this.imgList.push(params)
// }
- this.imgList = res.imgList
+ this.imgList = res.imgList
console.log('this.imgList', this.imgList)
}
})
@@ -497,20 +497,20 @@ export default {
this.imgList[this.imgList.length - 1].pathUrl = val
})
},
- uploadVoucher() {
- uploadImage(['album'], 5)
- .then((urls) => {
- if (urls) {
- this.imgList.push(urls[0])
- }
- })
- .catch((e) => {
- uni.showToast({
- title: '上传失败',
- icon: 'fail'
- })
- })
- },
+ uploadVoucher() {
+ uploadImage(['album'], 5)
+ .then((urls) => {
+ if (urls) {
+ this.imgList = urls
+ }
+ })
+ .catch((e) => {
+ uni.showToast({
+ title: '上传失败',
+ icon: 'fail'
+ })
+ })
+ },
// 删除图片
deleteImage(item) {
console.log('deleteImage', item)
@@ -521,9 +521,9 @@ export default {
}
console.log(this.imgList)
},
- deleteVoucher(index) {
- this.imgList.splice(index, 1)
- },
+ deleteVoucher(index) {
+ this.imgList.splice(index, 1)
+ },
uploadPrice() {
if (this.skuList.length === 0) {
uni.showToast({
diff --git a/pages/client-credit-list/index.vue b/pages/client-credit-list/index.vue
index a874c7d..8e0d96e 100644
--- a/pages/client-credit-list/index.vue
+++ b/pages/client-credit-list/index.vue
@@ -79,7 +79,7 @@ export default {
getFsCreditList({ mallSupplierId: this.$store.state.supplierInfo.supplierId, ...this.pagination })
.then((res) => {
if (res) {
- if (this.pagination.pageNum == 1) {
+ if (res.current == 1) {
this.list = res.records
} else {
this.list = this.list.concat(res.records)
diff --git a/pages/client-credit/index.vue b/pages/client-credit/index.vue
index 2730b27..5b5b6f4 100644
--- a/pages/client-credit/index.vue
+++ b/pages/client-credit/index.vue
@@ -194,6 +194,7 @@ export default {
getCreditList(data) {
getCustomerCreditInfo(data).then((res) => {
if (res) {
+ this.hasCreditList = []
res.hasCredit && this.hasCreditList.push('month')
res.hasFeisuanCredit && this.hasCreditList.push('fs')
this.isFinishedContract = res.isFinishedContract
diff --git a/pages/client-detail/base-paper-deals.vue b/pages/client-detail/base-paper-deals.vue
index 2ee4cca..91b2c5e 100644
--- a/pages/client-detail/base-paper-deals.vue
+++ b/pages/client-detail/base-paper-deals.vue
@@ -19,7 +19,11 @@
-
+
{{ subItem.productName }}
@@ -75,7 +79,7 @@ export default {
params: {
asc: '',
desc: '',
- customerEnterpriseId: this.id,
+ customerEnterpriseId: this.id,
mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id
// customerEnterpriseId: '651107734133018624', // 客户企业ID
// mallSupplierId: '670334117090562048', // 供应商id
@@ -115,7 +119,7 @@ export default {
.then((res) => {
// console.log('原纸交易', res)
if (res) {
- if (this.pagination.pageNum == 1) {
+ if (res.current == 1) {
this.list = res.records
} else {
this.list = this.list.concat(res.records)
diff --git a/pages/client-detail/equipment-information.vue b/pages/client-detail/equipment-information.vue
index c0b8d8e..d8555dd 100644
--- a/pages/client-detail/equipment-information.vue
+++ b/pages/client-detail/equipment-information.vue
@@ -184,7 +184,7 @@ export default {
el.collapse = false
el.isShowSelect = false
})
- if (this.pagination.pageNum == 1) {
+ if (res.current == 1) {
this.list = res.records
} else {
this.list = this.list.concat(res.records)
diff --git a/pages/client-list/index.vue b/pages/client-list/index.vue
index ead1686..9e8aa37 100644
--- a/pages/client-list/index.vue
+++ b/pages/client-list/index.vue
@@ -98,7 +98,7 @@ export default {
getCompanyList({ ...this.params, ...this.pagination })
.then((res) => {
if (res) {
- if (this.pagination.pageNum == 1) {
+ if (res.current == 1) {
this.list = res.records
} else {
this.list = this.list.concat(res.records)
diff --git a/pages/contract-manage/index.vue b/pages/contract-manage/index.vue
index 1e4115f..bd4e016 100644
--- a/pages/contract-manage/index.vue
+++ b/pages/contract-manage/index.vue
@@ -1,6 +1,6 @@
-
+
{
if (res) {
- if (this.pagination.pageNum == 1) {
+ if (res.current == 1) {
this.list = res.records
} else {
this.list = this.list.concat(res.records)
diff --git a/pages/credit-order-list/index.vue b/pages/credit-order-list/index.vue
index da05d78..732e040 100644
--- a/pages/credit-order-list/index.vue
+++ b/pages/credit-order-list/index.vue
@@ -116,7 +116,7 @@ export default {
getFinanceList({ ...this.condition, ...this.pagination })
.then((res) => {
if (res) {
- if (this.pagination.pageNum == 1) {
+ if (res.current == 1) {
this.list = res.records
} else {
this.list = this.list.concat(res.records)
diff --git a/pages/follow-up-records/index.vue b/pages/follow-up-records/index.vue
index cde4003..f2b93c0 100644
--- a/pages/follow-up-records/index.vue
+++ b/pages/follow-up-records/index.vue
@@ -73,7 +73,7 @@ export default {
emptyText: '暂无数据~',
background: '#F7F8FA',
disabled: false,
- emptyImage: '/static/imgs/order/order-empty.png'
+ emptyImage: '/static/imgs/order/order-empty.png'
},
params: {
asc: '',
@@ -115,7 +115,7 @@ export default {
.then((res) => {
// console.log('跟踪记录', res)
if (res) {
- if (this.pagination.pageNum == 1) {
+ if (res.current == 1) {
this.list = res.records
} else {
this.list = this.list.concat(res.records)
diff --git a/pages/guarantee-agreement/index.vue b/pages/guarantee-agreement/index.vue
index 38793c4..f1262a9 100644
--- a/pages/guarantee-agreement/index.vue
+++ b/pages/guarantee-agreement/index.vue
@@ -10,7 +10,7 @@
甲方: 广州千鸟云纸信息科技有限公司
注册地址: 广州市白云区钟落潭镇广从七路28号101
法定代表人/负责人:邹依倩
- 联系电话:
+ 联系电话:18028689006
乙方:
@@ -72,7 +72,7 @@
甲 方(盖章):
- 法定代表人/委托代理人(签名):
+ 法定代表人/委托代理人(签名):邹依倩
日 期: 年 月 日
@@ -117,6 +117,8 @@ export default {
onLoad(option) {
if (option) {
this.params = option
+ // 额外处理true / false
+ this.params.isFinishedContract = this.params.isFinishedContract === 'true'
} else {
uni.showToast({
title: '参数错误',
@@ -161,7 +163,7 @@ export default {
return
}
// 校验是否已签署担保协议
- if (this.isFinishedContract) {
+ if (this.params.isFinishedContract) {
uni.showToast({
title: '您已签署过担保协议,即将跳转',
icon: 'none',
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 299dbde..84ad048 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -72,14 +72,18 @@
请先完善企业基本信息
-
-
-
-
+
-
- 截图分享店铺
-
+
+
+
+
+
+
+ 下载二维码
+
+ {{ shareInfo.storeName }}
+ 每天上新特价纸,库存有限先到先得
@@ -88,7 +92,7 @@
diff --git a/pages/trade/index.vue b/pages/trade/index.vue
index af52a70..bda1055 100644
--- a/pages/trade/index.vue
+++ b/pages/trade/index.vue
@@ -27,10 +27,10 @@
-
+
-
+
diff --git a/pages/trade/orderList.vue b/pages/trade/orderList.vue
index 610f4e2..12619b3 100644
--- a/pages/trade/orderList.vue
+++ b/pages/trade/orderList.vue
@@ -110,7 +110,7 @@ export default {
getSupplierOrderList({ ...this.params, ...this.pagination })
.then((res) => {
if (res) {
- if (this.pagination.pageNum == 1) {
+ if (res.current == 1) {
this.list = res.records
} else {
this.list = this.list.concat(res.records)
diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue
index fd79733..9885f69 100644
--- a/pages/trade/quotationList.vue
+++ b/pages/trade/quotationList.vue
@@ -137,7 +137,7 @@ export default {
.then((res) => {
console.log('获取报价列表', res)
if (res) {
- if (this.pagination.pageNum == 1) {
+ if (res.current == 1) {
this.list = res.records
// this.list = []
// this.list = [{ name: '111', id: '222' }, { name: '111', id: '222' }]
diff --git a/static/imgs/start-page/dzqy.png b/static/imgs/start-page/dzqy.png
deleted file mode 100644
index a9d006f..0000000
Binary files a/static/imgs/start-page/dzqy.png and /dev/null differ
diff --git a/static/imgs/start-page/ht.png b/static/imgs/start-page/ht.png
deleted file mode 100644
index 7b01b90..0000000
Binary files a/static/imgs/start-page/ht.png and /dev/null differ
diff --git a/static/imgs/start-page/rz.png b/static/imgs/start-page/rz.png
deleted file mode 100644
index d804885..0000000
Binary files a/static/imgs/start-page/rz.png and /dev/null differ
diff --git a/static/imgs/start-page/zx.png b/static/imgs/start-page/zx.png
deleted file mode 100644
index bdc2ae8..0000000
Binary files a/static/imgs/start-page/zx.png and /dev/null differ
diff --git a/utils/hook.js b/utils/hook.js
index 6eaf95f..98d9a77 100644
--- a/utils/hook.js
+++ b/utils/hook.js
@@ -158,3 +158,55 @@ export function uploadFile(path, type = 'image') {
})
})
}
+
+/**
+ * 屏幕截图并保存到相册(不包含状态栏和tabBar)
+ */
+export function screenShot() {
+ var pages = getCurrentPages()
+ var page = pages[pages.length - 1]
+ var bitmap = null
+ // 获取当前页面 webview 的对象实例
+ var currentWebview = page.$getAppWebview()
+ bitmap = new plus.nativeObj.Bitmap('amway_img')
+ // 将webview内容绘制到Bitmap对象中
+ currentWebview.draw(
+ bitmap,
+ function () {
+ console.log('截屏绘制图片成功')
+ bitmap.save(
+ '_doc/a.jpg',
+ {},
+ function (i) {
+ uni.saveImageToPhotosAlbum({
+ filePath: i.target,
+ success: function () {
+ bitmap.clear() //销毁Bitmap图片
+ uni.showToast({
+ title: '保存图片成功',
+ mask: false,
+ duration: 1500
+ })
+ }
+ })
+ },
+ function (e) {
+ // console.log('保存图片失败:' + JSON.stringify(e))
+ uni.showToast({
+ title: '保存图片失败,请手动截图',
+ mask: false,
+ duration: 1500
+ })
+ }
+ )
+ },
+ function (e) {
+ // console.log('截屏绘制图片失败:' + JSON.stringify(e))
+ uni.showToast({
+ title: '保存图片失败,请手动截图',
+ mask: false,
+ duration: 1500
+ })
+ }
+ )
+}