diff --git a/app.json b/app.json
index 3c6d7f9..2025fb0 100644
--- a/app.json
+++ b/app.json
@@ -56,7 +56,8 @@
"pages/storeData/index",
"pages/storeData/customerData/index",
"pages/storeData/wechatData/index",
- "pages/storeData/orderData/index"
+ "pages/storeData/orderData/index",
+ "pages/order/editDeliveryckimg/index"
],
"echarts": [
{
diff --git a/pages/order/detail/index2.js b/pages/order/detail/index2.js
index a985308..dd01e4d 100644
--- a/pages/order/detail/index2.js
+++ b/pages/order/detail/index2.js
@@ -102,6 +102,12 @@ Page({
ins_img:res.data.imgs.ins_img.length==0?[]:res.data.imgs.ins_img,
other_img:res.data.imgs.other_img.length==0?[]:res.data.imgs.other_img,
})
+
+ if('delivery_ck_img' in res.data.imgs){
+ this.setData({
+ delivery_ck_img:res.data.imgs.delivery_ck_img.length==0?{}:res.data.imgs.delivery_ck_img,
+ })
+ }
}
wx.stopPullDownRefresh()
})
@@ -763,6 +769,12 @@ Page({
urls:img,
})
}
+ else if(e.currentTarget.dataset.type=='delivery_ck_img'){
+ wx.previewImage({
+ current:this.data.imgInfo.imgs.delivery_ck_img.img,
+ urls:[this.data.imgInfo.imgs.delivery_ck_img.img],
+ })
+ }
},
//推送链接
diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
index 9d544dd..0c6b549 100644
--- a/pages/order/detail/index2.wxml
+++ b/pages/order/detail/index2.wxml
@@ -327,6 +327,13 @@
-->
+
+
+ 交付确认单
+
+ {{delivery_ck_img.value?'更新':'上传'}}
+
+
@@ -392,6 +399,15 @@
+
+
+ 交付确认单
+
+
+
+
+
+
diff --git a/pages/order/editDeliveryckimg/index.js b/pages/order/editDeliveryckimg/index.js
new file mode 100644
index 0000000..65d1cbe
--- /dev/null
+++ b/pages/order/editDeliveryckimg/index.js
@@ -0,0 +1,87 @@
+import _ from '../../../commons/js/commons'
+const app = getApp()
+Page({
+ data: {
+ delivery_ck_img:{},//交付确认单
+ },
+ onLoad: function (options) {
+ for (let key in options) {
+ this.setData({
+ [key]: options[key]
+ })
+ }
+
+ this.getAppCusorderdata()
+
+ },
+ onShow: function () {
+
+ },
+
+ //获取订单图片
+ getAppCusorderdata(){
+ let params = {};
+ params['id'] = this.data.id;
+ _.apiQuery.getAppCusorderdata(params).then(res=>{
+ this.setData({
+ imgInfo:res.data,
+ })
+ if(res.data.img_status == 1){
+ this.setData({
+ delivery_ck_img:res.data.imgs.delivery_ck_img.length==0?{}:res.data.imgs.delivery_ck_img,
+ })
+ }
+ wx.stopPullDownRefresh()
+ })
+ },
+
+ //选择图片
+ chooseImg(e) {
+ let that = this
+
+ //上传登记证
+ if(e.currentTarget.dataset.type=='delivery_ck_img'){
+ wx.chooseImage({
+ count: 1, // 默认9
+ sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+ sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+ success(res) {
+ wx.showLoading({
+ title: '上传中',
+ })
+ wx.uploadFile({
+ url:_.config.api.upImg,
+ filePath:res.tempFilePaths[0],
+ name: 'img',
+ formData: {
+ 'app': 'liche'
+ },
+ success: (resp) => {
+ resp.data = JSON.parse(resp.data);
+ wx.hideLoading();
+ if (resp.data.code == 200) {
+ let params = {};
+ params['id'] = that.data.id;
+ params['delivery_ck_img'] = resp.data.data.url;
+ _.apiQuery.putAppCusorderdata(params).then(res2 => {
+ that.setData({
+ 'delivery_ck_img.value':resp.data.data.url,
+ 'delivery_ck_img.img':resp.data.data.full_url,
+ })
+ })
+ }
+ },
+ })
+ },
+ fail: res => {
+ wx.showToast({
+ title: '文件选择失败',
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
+ }
+ },
+
+})
\ No newline at end of file
diff --git a/pages/order/editDeliveryckimg/index.json b/pages/order/editDeliveryckimg/index.json
new file mode 100644
index 0000000..8af75d1
--- /dev/null
+++ b/pages/order/editDeliveryckimg/index.json
@@ -0,0 +1,4 @@
+{
+ "navigationBarTitleText": "交付确认单信息",
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/order/editDeliveryckimg/index.wxml b/pages/order/editDeliveryckimg/index.wxml
new file mode 100644
index 0000000..5f94a9f
--- /dev/null
+++ b/pages/order/editDeliveryckimg/index.wxml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传交付确认单
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/order/editDeliveryckimg/index.wxss b/pages/order/editDeliveryckimg/index.wxss
new file mode 100644
index 0000000..0995e1f
--- /dev/null
+++ b/pages/order/editDeliveryckimg/index.wxss
@@ -0,0 +1 @@
+/* pages/order/editDeliveryckimg/index.wxss */
\ No newline at end of file
diff --git a/pages/storeData/index.js b/pages/storeData/index.js
index 437087d..394f0ca 100644
--- a/pages/storeData/index.js
+++ b/pages/storeData/index.js
@@ -37,6 +37,8 @@ Page({
ecLine:{},
daysIndex:0,
daysArray:['近一周','近30日'],
+ isShowTip:false,
+ tipIndex:0,
},
onLoad: function (options) {
@@ -265,6 +267,19 @@ Page({
this.getAppBizStats_days()
},
+ //显示隐藏提示
+ optShowTip(e) {
+ this.setData({
+ isShowTip:!this.data.isShowTip,
+ })
+ if(e.currentTarget.dataset.index){
+ this.setData({
+ tipIndex:e.currentTarget.dataset.index
+ })
+ }
+ },
+
+
//推送链接
pushLink(e) {
if(e.currentTarget.dataset.url){
diff --git a/pages/storeData/index.wxml b/pages/storeData/index.wxml
index 8747a93..cc6d825 100644
--- a/pages/storeData/index.wxml
+++ b/pages/storeData/index.wxml
@@ -17,15 +17,18 @@
-
+
-
+
-
- {{item.value_1}}
- {{item.value_2}}
+
+
+ {{item.value_1}}
+ {{item.value_2}}
+
+
-
+
{{item.title}}
@@ -75,4 +78,19 @@
-
\ No newline at end of file
+
+
+
+
+
+
+ 发生在时间周期内的\n [客户建档] / [进店客户]
+ 发生在时间周期内的\n [企微添加好友] / [企微好友完善手机号码]
+ 发生在时间周期内的\n [下定订单] / [退款订单]
+
+
+
+ 知道了
+
+
+
\ No newline at end of file