Ver Fonte

no message

yanjie há 4 anos atrás
pai
commit
1b0c648f59
3 ficheiros alterados com 42 adições e 13 exclusões
  1. 1 1
      mini/pages/login/index.wxml
  2. 38 9
      mini/pages/project/index.js
  3. 3 3
      mini/pages/project/index.wxml

+ 1 - 1
mini/pages/login/index.wxml

xqd
@@ -5,7 +5,7 @@
     <view class="sg-form">
       <block wx:if="{{ type == 'mobile' || type == 'forget' }}">
         <view class="sg-form-item sg-bottom-border">
-          <van-field left-icon="user-o" value="{{ mobile }}" placeholder="请输入手机号" bind:change="updateValue"
+          <van-field left-icon="user-o" value="{{ mobile }}" type="number" placeholder="请输入手机号" bind:change="updateValue"
             data-name="mobile" label-class="sg-label" />
         </view>
         <view class="sg-form-item sg-bottom-border">

+ 38 - 9
mini/pages/project/index.js

xqd xqd xqd xqd xqd
@@ -79,11 +79,11 @@ Page({
       id: id,
       userInfo: app.globalData.userInfo
     })
-    api.getByName(this, 'getUserInfo', 'userInfo', {}, function(res) {
+    api.getByName(this, 'getUserInfo', 'userInfo', {}, function (res) {
       app.updateUserInfo(res);
     });
     var that = this;
-    api.getByName(this, 'project-roles/getRoleAndRights', 'role', {id: id}, function() {
+    api.getByName(this, 'project-roles/getRoleAndRights', 'role', { id: id }, function () {
       that.updateMenuItemShow()
     });
     wx.setStorageSync('sg-added-devices', [])
@@ -92,7 +92,7 @@ Page({
   requestAuth(e) {
     wx.requestSubscribeMessage({
       tmplIds: ['UxFg6zf47Gmha84hNzbdTJ3K0UHzcXNMPUbJQj-ivA8'],
-      success (res) {
+      success(res) {
         console.log(res)
       }
     })
@@ -109,7 +109,7 @@ Page({
     var role = this.data.role
     var device_rent_menus = this.data.device_rent_menus
     device_rent_menus[0].hidden = !(role && role.rights && role.rights.rentCreate)
-    if(['sub', 'admin'].indexOf(role.key) != -1) {
+    if (['sub', 'admin'].indexOf(role.key) != -1) {
       device_rent_menus[1].hidden = true;
       device_rent_menus[2].hidden = true;
     }
@@ -121,13 +121,42 @@ Page({
     })
   },
 
-  navigate: function(e) {
+  navigate: function (e) {
     var url = e.currentTarget.dataset.url
     var id = this.data.id
-    console.log(url)
-    if(url == '/pages/device-inner/index?id=' + id) {
+    if (url == '/pages/device-inner/index?id=' + id) {
       app.resetFilter();
     }
+    // if (url == '/pages/order/index?type=check') {
+    //   url = url + "&id=" + id
+    // }
+    // if (url == '/pages/order/index?index=4&type=abnormal') {
+    //   url = url + "&id=" + id
+    // }
+    // if (url == '/pages/order-inner/index?type=check') {
+    //   url = url + "&id=" + id
+    // }
+    // if (url == '/pages/order-inner/index?index=4&type=abnormal') {
+    //   url = url + "&id=" + id
+    // }
+    console.log(url)
+    switch (url) {
+      case '/pages/order/index?type=check':
+        url = url + "&id=" + id
+        break;
+      case '/pages/order/index?index=4&type=abnormal':
+        url = url + "&id=" + id
+        break;
+      case '/pages/order-inner/index?type=check':
+        url = url + "&id=" + id
+        break;
+      case '/pages/order-inner/index?index=4&type=abnormal':
+        url = url + "&id=" + id
+        break;
+      default:
+        url = url + "?id=" + id
+        break;
+    }
     wx.navigateTo({
       url: url,
     })
@@ -140,8 +169,8 @@ Page({
       data: {
         id: this.data.id
       },
-      success: function(res) {
-        if(res.code == 0) {
+      success: function (res) {
+        if (res.code == 0) {
           that.setData({
             project: res.data
           })

+ 3 - 3
mini/pages/project/index.wxml

xqd xqd xqd
@@ -26,7 +26,7 @@
     </view>
     <view class="sg-menu-list">
       <block wx:for="{{device_rent_menus}}" wx:key="index">
-        <view class="sg-item sg-flex sg-align-center sg-pad" bindtap="navigate" data-url="{{item.url}}?id={{id}}" wx:if="{{!item.hidden}}">
+        <view class="sg-item sg-flex sg-align-center sg-pad" bindtap="navigate" data-url="{{item.url}}" wx:if="{{!item.hidden}}">
           <image class="sg-img" src="{{item.img}}" mode="widthFix"></image>
           <view class="sg-name sg-margin-top-sm">{{item.title}}</view>
           <view class="sg-desp sg-margin-top-sm sg-gray-color sg-font-xs">{{item.desc}}</view>
@@ -40,7 +40,7 @@
       <text class="sg-sub-title sg-gray-color">内部设备调用</text>
     </view>
     <view class="sg-menu-list">
-      <view class="sg-item sg-flex sg-align-center sg-pad" wx:for="{{device_use_menus}}" wx:key="index" bindtap="navigate" data-url="{{item.url}}?id={{id}}" wx:if="{{!item.hidden}}">
+      <view class="sg-item sg-flex sg-align-center sg-pad" wx:for="{{device_use_menus}}" wx:key="index" bindtap="navigate" data-url="{{item.url}}" wx:if="{{!item.hidden}}">
         <image class="sg-img" src="{{item.img}}" mode="widthFix"></image>
         <view class="sg-name sg-margin-top-sm">{{item.title}}</view>
         <view class="sg-desp sg-margin-top-sm sg-gray-color sg-font-xs">{{item.desc}}</view>
@@ -64,7 +64,7 @@
       <text class="sg-sub-title sg-gray-color">内部设备管理</text>
     </view>
     <view class="sg-menu-list">
-      <view class="sg-item sg-flex sg-align-center sg-pad" wx:for="{{device_depot_menus}}" wx:key="index" bindtap="navigate" data-url="{{item.url}}?id={{id}}" data-title="{{item.title}}">
+      <view class="sg-item sg-flex sg-align-center sg-pad" wx:for="{{device_depot_menus}}" wx:key="index" bindtap="navigate" data-url="{{item.url}}" data-title="{{item.title}}">
         <image class="sg-img" src="{{item.img}}" mode="widthFix"></image>
         <view class="sg-name sg-margin-top-sm">{{item.title}}</view>
         <view class="sg-desp sg-margin-top-sm sg-gray-color sg-font-xs">{{item.desc}}</view>