查询范围修改

app.js

@@ -6,46 +6,6 @@ import {
 } from './utils/language';
 App({
   onLaunch(options) {
-    //小程序跳转进入
-    if (options.query.userMsg) {
-      wx.removeStorageSync('userMsg')
-      wx.removeStorageSync('auth')
-      wx.removeStorageSync('userauth');
-      wx.removeStorageSync('templetList');
-      wx.setStorageSync('userMsg', JSON.parse(options.query.userMsg));
-      wx.setStorageSync('auth', JSON.parse(options.query.auth));
-      wx.setStorageSync('siteP', JSON.parse(options.query.site));
-      wx.setStorageSync('templetList', JSON.parse(options.query.templetList));
-      wx.removeStorageSync('languagecode');
-      wx.setStorageSync('languagecode', options.query.languagecode);
-      //获取用户权限 
-      this.globalData.http.basic({
-        "classname": "sysmanage.develop.userauth.userauth",
-        "method": "query_userauth",
-        content: {
-          nocache: true
-        }
-      }).then(res => {
-        console.log("跳转进入查询权限", res)
-        if (res.code != '1') return wx.showToast({
-          title: '权限查询失败，请稍后再试',
-          icon: "none"
-        })
-        wx.setStorageSync('userauth', res.data);
-      });
-      _Http.basic({
-        "classname": "sysmanage.develop.optiontype.optiontype",
-        "method": "optiontypeselect",
-        "content": {
-          "typename": "statuscolors"
-        }
-      }).then(res => {
-        if (res.code != '1') return;
-        res.data.forEach(v => {
-          this.globalData.sColors[v.value] = v.remarks
-        })
-      });
-    }
   },
   initSocket() {
     let that = this;

pages/login/modules/account.js

@@ -24,7 +24,6 @@ Component({
             setTimeout(() => {
                 this.allowOrNot();
             }, 100)
-            getApp().globalData.Language.getLanguagePackage(this)
         }
     },
     methods: {

pages/login/modules/account.wxml

@@ -1,18 +1,18 @@
 <van-cell>
     <text slot='icon' class="iconfont icon-a-biaoqianlanwodexuanzhong" />
-    <input class="input" type="text" value='{{accountno}}' bindinput="inputChange" data-name="accountno" placeholder="{{(language['请输入']||'请输入') + (language['账户']?(' '+language['账户']):'账户名')}}" />
+    <input class="input" type="text" value='{{accountno}}' bindinput="inputChange" data-name="accountno" placeholder="请输入账户名" />
 </van-cell>
 <van-cell>
     <text slot='icon' class="iconfont icon-a-wodemima" />
-    <input class="input" wx:if="{{inputType=='text'}}" focus='{{focus}}' bindinput="inputChange" data-name="password" value="{{password}}" placeholder="{{(language['请输入']||'请输入') + (language['密码']?(' '+language['密码']):'密码')}}" />
-    <input class="input" wx:else type="password" focus='{{focus}}' bindinput="inputChange" data-name="password" value="{{password}}" placeholder="{{(language['请输入']||'请输入') + (language['密码']?(' '+language['密码']):'密码')}}" />
+    <input class="input" wx:if="{{inputType=='text'}}" focus='{{focus}}' bindinput="inputChange" data-name="password" value="{{password}}" placeholder="请输入密码" />
+    <input class="input" wx:else type="password" focus='{{focus}}' bindinput="inputChange" data-name="password" value="{{password}}" placeholder="请输入密码" />
     <view slot='right-icon' style=" width: 90rpx;height: 22.4px; display: flex; justify-content: flex-end;" catchtap="changePasswordType">
         <image class="image" src="{{inputType=='password'?'/static/image/dp-none.svg':'/static/image/dp-show.svg'}}" />
     </view>
 </van-cell>
 <view class="box">
     <van-checkbox custom-class='checkbox' label-class='label' icon-size="28rpx" value="{{ memory }}" shape="square" bind:change="isMemory">
-        {{language['记住密码']||'记住密码'}}
+        记住密码
     </van-checkbox>
-    <navigator url="./retrievePassword" class="view">{{language['忘记密码']||'忘记密码'}}?</navigator>
+    <navigator url="./retrievePassword" class="view">忘记密码?</navigator>
 </view>

pages/login/modules/login.js

@@ -58,15 +58,14 @@ function init() {
         wx.setStorageSync('siteP', list[1].data);
         wx.setStorageSync('banner_list', list[2].data)
         if (!getApp().globalData.socketEstablish) getApp().initSocket();
+        console.log("list[3].data", list[3].data)
+        console.log(wx.getStorageSync('userMsg').usertype)
         let data = list[3].data.find(v => v.templetname == '站点全部');
         if (data) {
             list[3].data = list[3].data.filter(v => v.templetname != '站点全部')
             list[3].data.unshift(data)
         }
-        wx.setStorageSync('templetList', list[3].data.map(v => {
-            v.templetname = getApp().globalData.Language.getMapText(v.templetname)
-            return v
-        }))
+        wx.setStorageSync('templetList', list[3].data)
 
         let pages = getCurrentPages();
         let prevPage = pages[pages.length - 2];

pages/login/modules/phone.js

@@ -26,7 +26,6 @@ Component({
             setTimeout(() => {
                 this.allowOrNot();
             }, 100)
-            getApp().globalData.Language.getLanguagePackage(this)
         }
     },
     methods: {

pages/login/modules/phone.wxml

@@ -1,16 +1,16 @@
 <van-cell>
     <text slot='icon' class="iconfont icon-a-wodemendianxinxidianhua" />
-    <input class="input" type="number" value='{{phonenumber}}' bindinput="inputChange" data-name="phonenumber" placeholder="{{language['电话号码'] || '请输入手机号'}}" />
+    <input class="input" type="number" value='{{phonenumber}}' bindinput="inputChange" data-name="phonenumber" placeholder="请输入手机号" />
 </van-cell>
 <van-cell>
     <text slot='icon' class="iconfont icon-a-biaoqianlanxiaoxixuanzhong" />
-    <input class="input" focus='{{focus}}' type="number" bindinput="inputChange" data-name="password" value="{{password}}" placeholder="{{language['请输入验证码']||'请输入验证码'}}" />
+    <input class="input" focus='{{focus}}' type="number" bindinput="inputChange" data-name="password" value="{{password}}" placeholder="请输入验证码" />
     <view slot='right-icon' class="right-icon" style="opacity:{{phonenumber.length==11?'1':'.5'}} ;" catchtap="{{phonenumber.length==11?'getPassword':''}}">
         {{showText=='获取验证码'?language[showText]||showText:language[showText]||showText+'s'}}
     </view>
 </van-cell>
 <view class="box">
     <van-checkbox custom-class='checkbox' label-class='label' icon-size="28rpx" value="{{ memory }}" shape="square" bind:change="isMemory">
-        {{language['记住号码'] || '记住号码'}}
+        记住号码
     </van-checkbox>
 </view>

pages/login/phone.js

@@ -4,7 +4,6 @@ Page({
         disabled: true, //是否禁用
         loading: false, //登陆中
         register: null,
-        languages: [],
         showDialog: false
     },
     async onLoad() {
@@ -14,21 +13,6 @@ Page({
         this.setData({
             devCount: 0,
         })
-        getApp().globalData.Language.getLanguagePackage(this, '账户登录');
-    },
-    changeLanguages(e) {
-        let item = this.data.languages[e.detail.value];
-        getApp().globalData.Language.getLanguages(item.languagecode).then(res => {
-            this.setData({
-                language: res,
-                languagename: item.languagename || '简体中文',
-                rowIndex: item.rowindex - 1
-            })
-            this.changeTitle();
-        })
-    },
-    changeTitle() {
-        getApp().globalData.Language.setNavBarTitle('账户登录')
     },
     /* 修改授权 */
     isAgreeChange() {

pages/login/phone.wxml

@@ -3,34 +3,28 @@
 </view>
 
 <!-- 手机号登录  -->
-<!-- <phone id='login' language='{{language}}' /> -->
+<!-- <phone id='login'  /> -->
 <!-- 账号登录 -->
-<account id='login' language='{{language}}' />
+<account id='login' />
 <view style="width: 100vw; text-align: center;margin-top: 60rpx;margin-bottom: 40rpx;">
-	<van-button disabled='{{disabled}}' custom-class='login' bindtap="userLogin" loading='{{loading}}' loading-text="{{language['登录中']||'登录中'}}..." color='linear-gradient(90deg, #3874F6 0%, #095DE0 100%);'>{{language['登录']||'登录'}}</van-button>
+	<van-button disabled='{{disabled}}' custom-class='login' bindtap="userLogin" loading='{{loading}}' loading-text="登录中..." color='linear-gradient(90deg, #3874F6 0%, #095DE0 100%);'>登录</van-button>
 </view>
 <!-- 隐私协议 -->
 <view class="agreement">
-	<van-checkbox icon-size="28rpx" label-class='con' value="{{ isAgree }}" bind:change="isAgreeChange"> {{language['已阅读并同意']||'已阅读并同意'}}<text catchtap="checkTheAgreement">《{{language['隐私协议']||'隐私协议'}}》</text></van-checkbox>
+	<van-checkbox icon-size="28rpx" label-class='con' value="{{ isAgree }}" bind:change="isAgreeChange"> 已阅读并同意<text catchtap="checkTheAgreement">《隐私协议》</text></van-checkbox>
 </view>
 <!-- 快捷登录 -->
 <block>
 	<view style="height: 100rpx;" />
-	<van-divider contentPosition="center">{{language['其他登录方式']||'其他登录方式'}}</van-divider>
+	<van-divider contentPosition="center">其他登录方式</van-divider>
 	<view style="width: 100%; text-align: center;">
 		<text class="iconfont icon-a-wodebangdingweixin" style="font-size: 100rpx; color:#07C160;" bindtap="wechatLogin" />
 	</view>
 </block>
 
-<van-dialog use-slot show='{{ showDialog }}' confirmButtonText="{{language['同意并获取']||'同意并获取'}}" cancelButtonText="{{language['取消']||'取消'}}" confirm-button-color='var(--assist)' show-cancel-button bind:confirm='onConfirm'>
+<van-dialog use-slot show='{{ showDialog }}' confirmButtonText="{{language['同意并获取']||'同意并获取'}}" cancelButtonText="取消" confirm-button-color='var(--assist)' show-cancel-button bind:confirm='onConfirm'>
 	<view class="dialog">
-		{{language['请阅读并同意']||'请阅读并同意'}}
-		<navigator class="navigator" url="#" bind:tap="checkTheAgreement">《{{language['隐私协议']||'隐私协议'}}》</navigator>
+		请阅读并同意
+		<navigator class="navigator" url="#" bind:tap="checkTheAgreement">《隐私协议》</navigator>
 	</view>
-</van-dialog>
-
-<view style="text-align: center; margin-top: 20px;">
-	<picker mode="selector" range="{{languages}}" range-key='languagename' value="{{rowIndex}}" bindchange='changeLanguages'>
-		{{languagename}}
-	</picker>
-</view>
+</van-dialog>

pages/tabbar/home/index.js

@@ -38,10 +38,14 @@ Page({
         }).then(res => {
             console.log("获取列表查询条件", res)
             if (res.code != '1') return;
-            let data = res.data.find(v => v.templetname == '站点全部');
-            if (data) {
-                res.data = res.data.filter(v => v.templetname != '站点全部')
-                res.data.unshift(data)
+            if (wx.getStorageSync('userMsg').usertype == '0') {
+                let data = res.data.find(v => v.templetname == '站点全部');
+                if (data) {
+                    res.data = res.data.filter(v => v.templetname != '站点全部')
+                    res.data.unshift(data)
+                }
+            } else {
+                list[3].data = list[3].data.filter(v => v.templetname != '站点全部')
             }
             wx.setStorageSync('templetList', res.data.map(v => {
                 v.templetname = getApp().globalData.Language.getMapText(v.templetname)

prsx/department/index.js

@@ -37,7 +37,6 @@ Page({
     async onLoad() {
         getApp().globalData.Language.getLanguagePackage(this);
         let templetList = wx.getStorageSync('templetList')
-        if (![0, 21].includes(wx.getStorageSync('userMsg').usertype)) templetList = templetList.filter(v => v.templetid != '99')
         this.setData({
             insert: wx.getStorageSync('auth').wdepartment.options.some(v => v == 'insert'), //查询新增权限
             classActions: templetList.map((v, i) => {

prsx/doctors/index.js

@@ -37,7 +37,6 @@ Page({
     async onLoad() {
         getApp().globalData.Language.getLanguagePackage(this);
         let templetList = wx.getStorageSync('templetList')
-        if (![0, 21].includes(wx.getStorageSync('userMsg').usertype)) templetList = templetList.filter(v => v.templetid != '99')
         this.setData({
             insert: wx.getStorageSync('auth').wdoctors.options.some(v => v == 'insert'), //查询新增权限
             classActions: templetList.map((v, i) => {

prsx/hospital/index.js

@@ -39,7 +39,6 @@ Page({
     async onLoad(options) {
         getApp().globalData.Language.getLanguagePackage(this);
         let templetList = wx.getStorageSync('templetList')
-        if (![0, 21].includes(wx.getStorageSync('userMsg').usertype)) templetList = templetList.filter(v => v.templetid != '99')
         this.setData({
             insert: wx.getStorageSync('auth').wdepartment.options.some(v => v == 'insert'), //查询新增权限
             classActions: templetList.map((v, i) => {