conflict

test_mini/pages/candidate/index.js

@@ -78,6 +78,17 @@ Page({
   bindinput2: function(e){
     this.data.ID_number = e.detail.value
   },
+  copyUrl: function(e){
+    wx.setClipboardData({
+      data: e.currentTarget.dataset.url,
+      success: function (res) {
+        wx.showToast({
+          title: '复制成功,可前往自带浏览器粘贴访问',
+          icon: 'none'
+        })
+      }
+    })
+  },
   search: function() {
     if(this.data.realname && this.data.ID_number){
       var data = {

test_mini/pages/candidate/index.wxml

@@ -1,39 +1,39 @@
-
-    <view class="weui-cells__title">查询信息</view>
-    <view class="weui-cells weui-cells_after-title">
-      <view class="weui-cell" >
-            <view class="weui-cell__hd"><label class="weui-label">真实姓名</label></view>
-						<view class="weui-cell__bd">
-							<input class="weui-input" placeholder="填写真实姓名" placeholder-class="weui-input__placeholder" 
-              bindinput="bindinput1" value="{{realname}}"/>
-						</view>
-      </view>
-      <view class="weui-cell" >
-            <view class="weui-cell__hd"><label class="weui-label">身份证号</label></view>
-						<view class="weui-cell__bd">
-							<input class="weui-input" type="idcard" placeholder="填写身份证号" placeholder-class="weui-input__placeholder" 
-              bindinput="bindinput2" value="{{ID_number}}"/>
-						</view>
-      </view>
+<view class="weui-cells__title">查询信息</view>
+<view class="weui-cells weui-cells_after-title">
+  <view class="weui-cell">
+    <view class="weui-cell__hd"><label class="weui-label">真实姓名</label></view>
+    <view class="weui-cell__bd">
+      <input class="weui-input" placeholder="填写真实姓名" placeholder-class="weui-input__placeholder" bindinput="bindinput1"
+        value="{{realname}}" />
     </view>
-    <view style="text-align:center;margin-top:4px;">
-      <l-button bind:lintap="search">查询</l-button>
+  </view>
+  <view class="weui-cell">
+    <view class="weui-cell__hd"><label class="weui-label">身份证号</label></view>
+    <view class="weui-cell__bd">
+      <input class="weui-input" type="idcard" placeholder="填写身份证号" placeholder-class="weui-input__placeholder"
+        bindinput="bindinput2" value="{{ID_number}}" />
     </view>
-    <view class="weui-cells__title">查询结果</view>
-    <view wx:if="{{candidates.length}}">
-    <block wx:for="{{candidates}}" wx:key="unique">
-    <view class="weui-cell" data-url="{{item.img}}">
-                <view class="weui-cell__bd">
-                <view class="weui-media-box__title">
-        单号:{{item.report_number}}</view>
+  </view>
+</view>
+<view style="text-align:center;margin-top:4px;">
+  <l-button bind:lintap="search">查询</l-button>
+</view>
+<view class="weui-cells__title">查询结果</view>
+<view wx:if="{{candidates.length}}">
+  <block wx:for="{{candidates}}" wx:key="unique">
+    <view class="weui-cell" data-url="{{item.img}}" bindlongpress="copyUrl">
+      <view class="weui-cell__bd">
+        <view class="weui-media-box__title">
+          单号:{{item.report_number}}</view>
         <view class="weui-media-box__desc">
           <view style="color:darkblue">发证日期:{{item.issue_date}}</view>
         </view>
-        </view>
-                <view class="weui-cell__ft">
-                <view style="color:green">通过考核</view>
-                </view>
-            </view>
-    </block>
+      </view>
+      <view class="weui-cell__ft">
+        <view style="color:green">通过考核</view>
+        <view >长按复制地址去浏览器打开</view>
+      </view>
     </view>
-    <view wx:else style="text-align:center">暂无证书信息</view>
+  </block>
+</view>
+<view wx:else style="text-align:center">暂无证书信息</view>

test_mini/project.config.json

@@ -29,7 +29,7 @@
       "outputPath": ""
     },
     "useIsolateContext": true,
-    "useCompilerModule": false,
+    "useCompilerModule": true,
     "userConfirmedUseCompilerModuleSwitch": false,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
@@ -38,7 +38,7 @@
     "bundle": false
   },
   "compileType": "miniprogram",
-  "libVersion": "2.11.3",
+  "libVersion": "2.14.1",
   "appid": "wxf1e9471c93f05ad6",
   "projectname": "test_mini",
   "debugOptions": {

test_server/crm/permission.py

@@ -53,6 +53,8 @@ class MyPermission(RbacPermission):
             if not hasattr(view, 'perms_map'):
                 return True
             elif 'account_exceed' in perms: #账户过期
+                if request.user.exceed_date and (request.user.exceed_date >= datetime.date(timezone.now())):
+                    return True
                 return False
             else:
                 perms_map = view.perms_map