Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

components/dkbase/dk-form/dk-form.js

@@ -88,7 +88,7 @@ Component({
     checked: false
   },
   lifetimes: {
-    attached: function () {},
+    attached: function () { },
     detached: function () {
       // 在组件实例被从页面节点树移除时执行
       // 清空地址信息
@@ -179,7 +179,7 @@ Component({
             }
           });
         }
-      }); 
+      });
     },
     /**
      * @desc : tip点击事件
@@ -777,6 +777,46 @@ Component({
         card: item.card
       })
     },
+    openRemindDatePopTime(e) {
+      const that = this
+      const tmplIds = Constants.miniMessageModelIds
+      // 获取微信基础配置
+      wx.getSetting({
+        withSubscriptions: true,
+        success(res) {
+          console.log('getSetting', res);
+          let bol = false
+          // 适配存在多个订阅消息模板的情况
+          if (res.subscriptionsSetting.itemSettings) {
+            const obj = res.subscriptionsSetting.itemSettings
+            Object.keys(obj).forEach((key) => {
+              if (obj[key] !== 'accept') {
+                bol = true
+              }
+            })
+          } else {
+            bol = true
+          }
+          if(bol){
+              // 如果配置中用户未订阅消息 则弹窗
+              wx.requestSubscribeMessage({
+                tmplIds: tmplIds,
+                success(res) {
+                  that.openDatePopTime(e)
+                },
+                fail(res) {
+                  that.openDatePopTime(e)
+                }
+              })
+            } else {
+              that.openDatePopTime(e)
+            }
+        },
+        fail(res) {
+          that.openDatePopTime(e)
+        }
+      })
+    },
     /**
      * @desc   : 关闭日期pop
      * @author : 周兴

components/dkbase/dk-form/dk-form.wxml

@@ -70,6 +70,10 @@
       <van-field wx:if="{{item.type=='dateTime'}}" required="{{item.required?true:false }}" is-link value="{{ form[item.code]}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" data-item="{{item}}" data-key="{{item.code}}" data-index="{{index}}" data-card="{{card.name}}" errorMessage="{{item.errMsg}}" border="{{ false }}" clearable readonly="{{true}}" label-class="{{!!item.readonly?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" catchtap="openDatePopTime">
         <van-icon wx:if="{{!readonly &&  form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
       </van-field>
+      <!-- 跟进提醒时间 -->
+      <van-field wx:if="{{item.type=='remindDateTime'}}" required="{{item.required?true:false }}" is-link value="{{ form[item.code]}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" data-item="{{item}}" data-key="{{item.code}}" data-index="{{index}}" data-card="{{card.name}}" errorMessage="{{item.errMsg}}" border="{{ false }}" clearable readonly="{{true}}" label-class="{{!!item.readonly?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" catchtap="openRemindDatePopTime">
+        <van-icon wx:if="{{!readonly &&  form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
+      </van-field>
       <!--tab标签-->
       <van-field wx:if="{{item.type=='tabs' && !item.hide}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="{{!!item.readonly?'readonly-label':'nomal-label'}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
         <view slot="inputbefor" style="text-align: left;padding-left: 10rpx;" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" data-value="{{form[item.code]}}" data-key="{{item.code}}" catchtap="changeTabs">

package-basic-data/pages/customer-follow-up/customer-follow-up.js

@@ -32,7 +32,7 @@ Page({
         { code: 'intention', name: 'intentionName', type: 'drop', required: true, dropType: 'customerIntention', title: mixins.$t('intention') },
         { code: 'followType', name: 'followTypeName', type: 'textarea', dropType: 'followType', type: 'drop', required: true, title: mixins.$t('followType') },
         { code: 'followData', type: 'textarea', required: true, title: mixins.$t('followData') },
-        { code: 'nextFollowTime', type: 'dateTime', required: true, title: mixins.$t('nextFollowTime') },
+        { code: 'nextFollowTime', type: 'remindDateTime', required: true, title: mixins.$t('nextFollowTime') },
         { code: 'stayTimeLen', name: 'stayTimeLenName', required: true, title: mixins.$t('stayTimeLen'), dropType: 'storeRetentionTime', type: 'drop', },
       ],
     },
@@ -262,7 +262,7 @@ Page({
       { code: 'intention', name: 'intentionName', type: 'drop', required: true, dropType: 'customerIntention', title: mixins.$t('intention') },
       { code: 'followType', name: 'followTypeName', type: 'textarea', dropType: 'followType', type: 'drop', required: true, title: mixins.$t('followType') },
       { code: 'followData', type: 'textarea', required: true, title: mixins.$t('followData') },
-      { code: 'nextFollowTime', type: 'dateTime', required: true, title: mixins.$t('nextFollowTime') },
+      { code: 'nextFollowTime', type: 'remindDateTime', required: true, title: mixins.$t('nextFollowTime') },
       { code: 'stayTimeLen', name: 'stayTimeLenName', required: true, title: mixins.$t('stayTimeLen'), dropType: 'storeRetentionTime', type: 'drop', },
     ]
 
@@ -288,7 +288,7 @@ Page({
       // { code: 'followType', name: 'followTypeName', type: 'textarea', dropType: 'followType', type: 'drop', required: true, title: mixins.$t('followType') },
       { code: 'followData', type: 'textarea', required: true, title: mixins.$t('followData') },
       { code: 'nextFollowPlan', type: 'textarea', required: false, title: mixins.$t('nextFollowPlan') },
-      { code: 'nextFollowTime', type: 'dateTime', required: true, title: mixins.$t('nextFollowTime') },
+      { code: 'nextFollowTime', type: 'remindDateTime', required: true, title: mixins.$t('nextFollowTime') },
     ]
     let radioFollowUpList22 = [
       { code: 'cusName', type: 'str', required: false, title: mixins.$t('customerName'), readonly: true },
@@ -315,7 +315,7 @@ Page({
       { code: 'followTime', type: 'dateTime', required: true, title: mixins.$t('nextFollowTimeS') },
       { code: 'followData', type: 'textarea', required: true, title: mixins.$t('followData') },
       { code: 'nextFollowPlan', type: 'textarea', required: false, title: mixins.$t('nextFollowPlan') },
-      { code: 'nextFollowTime', type: 'dateTime', required: true, title: mixins.$t('nextFollowTime') },
+      { code: 'nextFollowTime', type: 'remindDateTime', required: true, title: mixins.$t('nextFollowTime') },
 
     ]
     let radioFollowUpList33 = [

package-basic-data/pages/customer-follow-up/follow-up-tasks/follow-up-tasks.js

@@ -24,7 +24,7 @@ Page({
         { code: 'cusName', type: 'str', required: true, readonly: true, title: mixins.$t('cusName') },
         { code: 'followUser', name: 'followUserName', type: 'drop', required: true, dropType: 'staff', title: mixins.$t('staffId') },
         { code: 'nextFollowPlan', type: 'textarea', rows: '5', showWordLimit: true, title: mixins.$t('nextFollowPlan') },
-        { code: 'nextFollowTime', type: 'dateTime', required: true, title: mixins.$t('nextFollowTimePlan') },
+        { code: 'nextFollowTime', type: 'remindDateTime', required: true, title: mixins.$t('nextFollowTimePlan') },
       ]
     },
   },

package-basic-data/pages/customer-reception/add/add.js

@@ -30,7 +30,7 @@ Page({
         { code: 'addressNo', type: 'str', required: false, title: mixins.$t('addressNo') },
         { code: 'intention', name: 'intentionName', type: 'drop', required: true, dropType: 'customerIntention', title: mixins.$t('intention') },
         { code: 'remarks', type: 'textarea', rows: '5', required: true, showWordLimit: true, title: mixins.$t('followData') },
-        { code: 'nextFollowTime', type: 'dateTime', required: true, title: mixins.$t('nextFollowTime') },
+        { code: 'nextFollowTime', type: 'remindDateTime', required: true, title: mixins.$t('nextFollowTime') },
         { code: 'stayTimeLen', name: 'stayTimeLenName', required: true, title: mixins.$t('stayTimeLen'), dropType: 'storeRetentionTime', type: 'drop', },
         { code: 'file', type: 'uploader', title: mixins.$t("uploader") }
       ]
@@ -260,7 +260,7 @@ Page({
       { code: 'addressNo', type: 'str', required: false, title: mixins.$t('addressNo') },
       { code: 'intention', name: 'intentionName', type: 'drop', required: true, dropType: 'customerIntention', title: mixins.$t('intention') },
       { code: 'remarks', type: 'textarea', rows: '5', required: true, showWordLimit: true, title: mixins.$t('followData') },
-      { code: 'nextFollowTime', type: 'dateTime', required: true, title: mixins.$t('nextFollowTime') },
+      { code: 'nextFollowTime', type: 'remindDateTime', required: true, title: mixins.$t('nextFollowTime') },
       { code: 'stayTimeLen', name: 'stayTimeLenName', required: true, title: mixins.$t('stayTimeLen'), dropType: 'storeRetentionTime', type: 'drop', },
       { code: 'file', type: 'uploader', title: mixins.$t("uploader") }
     ]

package-basic-data/pages/customer-reception/measure-to/measure-to.js

@@ -31,7 +31,7 @@ Page({
         { code: 'staffName', type: 'str', required: false, title: mixins.$t('measureSales'), readonly: true },
         { code: 'flgAgainMeasure', type: 'checkedBox', required: false, title: mixins.$t('flgAgainMeasure'), readonly: false },
         { code: 'measureRemarks', type: 'textarea', required: false, rows: '5', title: mixins.$t('measureRemarks') },
-        { code: 'measureTime', type: 'dateTime', required: true, title: mixins.$t('measureTime') },
+        { code: 'measureTime', type: 'remindDateTime', required: true, title: mixins.$t('measureTime') },
       ]
     },
     measureRoomList: [
@@ -276,7 +276,7 @@ Page({
         { code: 'staffName', type: 'str', required: false, title: mixins.$t('sales'), readonly: true },
         { code: 'flgAgainMeasure', type: 'checkedBox', required: false, title: mixins.$t('flgAgainMeasure'), readonly: false },
         { code: 'measureRemarks', type: 'textarea', required: false, rows: '5', title: mixins.$t('measureRemarks') },
-        { code: 'measureTime', type: 'dateTime', required: true, title: mixins.$t('measureTime') },
+        { code: 'measureTime', type: 'remindDateTime', required: true, title: mixins.$t('measureTime') },
 
       ]
     }

package-inventory/pages/ivt-detail-report/ivt-detail-report.wxml

@@ -64,8 +64,6 @@
   </view>
 </view> -->
 
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;">
-	<view bind:tap="export" class="btn-add-class">
-		<van-icon name="share" color="#FFFFFF" size="60rpx" />
-	</view>
+<view  style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="export">
+  <image src="{{imageUrl + 'excel.png'}} " class="edit-class" />
 </view>

pages/home-page/home-page.wxss

@@ -221,6 +221,7 @@ page {
 
 .card-bottom-button-font {
   font-size: 2.6vw;
+  white-space:nowrap;
 }
 
 .func {

pages/login/login.js

@@ -84,9 +84,9 @@ Page({
     //   url = 'https://www.dongkesoft.com/public/index/changjian/news_info/id/102.html'
     // }
     if(e.currentTarget.dataset.type == 'user'){
-      url = 'https://zy.op.dkiboss.com/agreement-index?agId=10002024-0718-0000-0000-000005c0a01e'
+      url = config.knowledge_url +  '/agreement-index?agId=10002024-0718-0000-0000-000005c0a01e'
     }else{
-      url = 'https://zy.op.dkiboss.com/agreement-index?agId=10002024-0718-0000-0000-000005c145ff'
+      url = config.knowledge_url +  '/agreement-index?agId=10002024-0718-0000-0000-000005c145ff'
     }
     let toUrl = '/pages/product/product'
     if (url) {

utils/Constants.js

@@ -38,7 +38,7 @@ module.exports = {
   Messages: {
     save_sucess: '保存成功',
   },
-
+  miniMessageModelIds:['z3REuwft6NLPxVW8s5HN1UgWjFstWjD0QfCXNLTa0LA'],
   lang: {
     //中文编码
     langCN: 'zh-CN',