Strona główna Odkrywaj Pomoc
Zaloguj się
derkj
/
NN2019090901
1
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

wesmiler

wesmiler 6 lat temu
rodzic
311d255148
commit
9f22dfde53
5 zmienionych plików z 61 dodań i 7 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 3 2
      data/config/weixin.php
  2. 52 0
      index.html
  3. 1 1
      public/themes/admin_simpleboot3/admin/business/device_add.html
  4. 2 1
      public/themes/admin_simpleboot3/admin/business/device_edit.html
  5. 3 3
      vendor/thinkcmf/cmf-app/src/weixin/controller/BaseController.php

+ 3 - 2
data/config/weixin.php
Wyświetl plik 

@@ -3,10 +3,11 @@
 
  * 微信配置
 
  */
 
 return [
 
-    'debug'=> true, // 是否测试模式
 
+    'debug'=> false, // 是否测试模式
 
     'payDebug'=> false, // 微信支付测试，开启后支付金额为0.01元
 
     'payResult'=> false, // 是否记录支付结果
 
-    'openid'=> 'ovq0y1RsHuL3gHgxdZCTJ81E2ryk', // 测试模式测试用户OPENID
 
+    'openid'=> '', // 测试模式测试用户OPENID
 
+//    'openid'=> 'ovq0y1RsHuL3gHgxdZCTJ81E2ryk', // 测试模式测试用户OPENID
 
     'update_expire'=> 3*3600, // 没三个小时更新一次微信信息
 
     'appid'=> 'wx8c48b975e9b56508', // APPID
 
     'appsecret'=> 'd318b4ca843f052ad6e0b263efa2609b', // AppSecret

+ 52 - 0
index.html
Wyświetl plik 

@@ -0,0 +1,52 @@
 
+<!DOCTYPE html>
 
+<html>
 
+<head>
 
+    <meta
 
+             http-equiv=Content-Type content="text/html;charset=utf-8">
 
+    <meta
 
+             http-equiv=X-UA-Compatible content="IE=edge,chrome=1">
 
+    <meta
 
+             name=renderer content=webkit>
 
+    <meta
 
+             name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no">
 
+    <link
 
+             rel="shortcut icon"  href=favicon.ico type=image/x-icon>
 
+    <title>泸定县物流分拣中心</title>
 
+    <link
 
+             href="https://cdn.bootcss.com/element-ui/2.11.1/theme-chalk/index.css"  rel=stylesheet>
 
+    <link
 
+             href="https://cdn.bootcss.com/nprogress/0.2.0/nprogress.min.css"  rel=stylesheet>
 
+    <link
 
+             href="./permission/static/css/app.e52c6d70.css"  rel=stylesheet>
 
+</head>
 
+<body>
 
+<div
 
+         id=app></div>
 
+<script
 
+         src="//at.alicdn.com/t/font_1258069_e40c6mwl0x8.js"></script>
 
+<script
 
+         src="https://cdn.bootcss.com/vue/2.6.10/vue.min.js"></script>
 
+<script
 
+         src="https://cdn.bootcss.com/vue-router/3.1.2/vue-router.min.js"></script>
 
+<script
 
+         src="https://cdn.bootcss.com/vuex/2.3.1/vuex.min.js"></script>
 
+<script
 
+         src="https://cdn.bootcss.com/axios/0.19.0/axios.min.js"></script>
 
+<script
 
+         src="https://cdn.bootcss.com/vue-i18n/8.13.0/vue-i18n.min.js"></script>
 
+<script
 
+         src="https://cdn.bootcss.com/element-ui/2.11.1/index.js"></script>
 
+<script
 
+         src="https://cdn.bootcss.com/echarts/3.8.5/echarts.min.js"></script>
 
+<script
 
+         src="https://cdn.bootcss.com/Mock.js/1.0.1-beta3/mock-min.js"></script>
 
+<script
 
+         src="https://cdn.bootcss.com/nprogress/0.2.0/nprogress.min.js"></script>
 
+<script
 
+         src="https://cdn.bootcss.com/js-cookie/2.2.0/js.cookie.min.js"></script>
 
+<script
 
+         src="./permission/static/js/vendors~app.229fba12.js"></script>
 
+<script
 
+         src="./permission/static/js/app.d079e7d8.js"></script>
 
+</body>
 
+</html>

+ 1 - 1
public/themes/admin_simpleboot3/admin/business/device_add.html
Wyświetl plik 

@@ -42,7 +42,7 @@
 
         <div class="form-group">
 
             <label for="input-device_code" class="col-sm-2 control-label"><span class="form-required">*</span>设备号</label>
 
             <div class="col-md-6 col-sm-6">
 
-                <input type="text" class="form-control" id="input-device_code" name="device_code" placeholder="唯一序列号">
 
+                <input type="text" class="form-control" id="input-device_code" name="device_code" placeholder="唯一序列号"><label for="show_device_code"><input id="show_device_code" type="checkbox" value="" checked>显示设备号</label>
 
             </div>
 
         </div>
 
         <div class="form-group">

+ 2 - 1
public/themes/admin_simpleboot3/admin/business/device_edit.html
Wyświetl plik 

@@ -42,7 +42,8 @@
 
         <div class="form-group">
 
             <label for="input-device_code" class="col-sm-2 control-label"><span class="form-required">*</span>设备号</label>
 
             <div class="col-md-6 col-sm-6">
 
-                <input type="text" class="form-control" id="input-device_code" name="device_code" placeholder="唯一序列号" value="{$info.device_code|default=''}">
 
+                <input type="text" class="form-control" id="input-device_code" name="device_code" placeholder="唯一序列号" value="{$info.device_code|default=''}"><label
 
+                    for="show_device_code"><input id="show_device_code" type="checkbox" value="" <if condition="$info.show_device_code == 1">checked</if>>显示设备号</label>
 
             </div>
 
         </div>
 
         <div class="form-group">

+ 3 - 3
vendor/thinkcmf/cmf-app/src/weixin/controller/BaseController.php
Wyświetl plik 

@@ -28,7 +28,7 @@ class BaseController extends HomeBaseController
 
                 $openid = $curOpenId? $curOpenId : config('weixin.openid');
 
                 session('openid', $openid);
 
                 $field = 'id,openid,user_login,mobile,real_name,user_nickname,avatar';
 
-                $this->userInfo = Member::getInfo(['openid'=> $openid],$field);
 
+                $this->userInfo = Member::getInfo(['openid'=> $openid,'user_type'=> 2],$field);
 
                 session('userInfo', $this->userInfo);
 
 
             }
 
@@ -64,7 +64,7 @@ class BaseController extends HomeBaseController
 
                 $openid = $curOpenId? $curOpenId : config('weixin.openid');
 
                 session('openid', $openid);
 
                 $field = 'id,openid,user_login,mobile,real_name,user_nickname,avatar';
 
-                $this->userInfo = Member::getInfo(['openid'=> $openid],$field);
 
+                $this->userInfo = Member::getInfo(['openid'=> $openid,'user_type'=> 2],$field);
 
                 session('userInfo', $this->userInfo);
 
             }
 
 
@@ -94,7 +94,7 @@ class BaseController extends HomeBaseController
 
         }
 
 
         $field = 'id,openid,user_login,mobile,real_name,user_nickname,avatar';
 
-        $userInfo = db('user')->field($field)->where(['id'=> $this->userId])->find();
 
+        $userInfo = db('user')->field($field)->where(['id'=> $this->userId,'user_type'=> 2])->find();
 
         $mobile = isset($userInfo['mobile'])? trim($userInfo['mobile']) : '';
 
         $realName = isset($userInfo['real_name'])? trim($userInfo['real_name']) : '';
 
         // 若未绑定手机号码