heyang

pages/gasBottle/gasManage/gasManage.vue

@@ -1,6 +1,6 @@
 <!-- 用气管理 -->
 <template>
-    <view id="register">
+    <view class="register">
 		<view class="register_li">
 			<view class="register_li_min" @click="handleClick('stockList')">
 				<view>库存列表</view>
@@ -153,7 +153,7 @@
 </script>
 
 <style lang="stylus" scoped>
-    #register{
+    .register{
         height:auto;
         width:100%;
         display flex;

pages/home.vue

@@ -1,7 +1,7 @@
 <template>
   <view id="home">
     <manage-home v-if="userType==1" ref="manage"></manage-home>
-    <user-home v-if="userType==2"></user-home>
+    <gas-manage v-if="userType==2"></gas-manage>
     <supplier-home v-if="userType==3"></supplier-home>
     <tab-bar v-if="userType!=3"></tab-bar>
   </view>
@@ -9,6 +9,7 @@
 <script>
 import { manageHome } from '@/pages/manageWorkbench'
 import { userHome } from '@/pages/studentWorkbench.vue'
+import { gasManage } from '@/pages/gasManageWorkbench'
 import { supplierHome } from '@/pages/supplierWorkbench.vue'
 import { tabBar } from '@/component/tabBar.vue'
 export default {
@@ -16,6 +17,7 @@ export default {
   components: {
     manageHome,
     userHome,
+    gasManage,
     supplierHome,
     tabBar
   },

pages/mine.vue

@@ -163,25 +163,31 @@ export default {
   methods: {
     //学生端-信用分/奖励分/扫一扫按钮
     goUserPage(type){
-      let self = this;
-      if(type == 1){
-        uni.navigateTo({
-          url: '/pages_student/mine/creditPoints',
-        });
-      }else if(type == 2){
-        uni.navigateTo({
-          url: '/pages_student/mine/rewardPoints',
-        });
-      }else if(type == 3){
-        uni.scanCode({
-          onlyFromCamera: true,
-          success: function (res) {
-            uni.navigateTo({
-              url: '/pages_student/mine/codeSuccess?q='+encodeURIComponent(JSON.stringify(res.result))
-            });
-          }
-        });
-      }
+		uni.showToast({
+			title: '暂未开放',
+			mask:true,
+			icon:"none",
+			duration: 2000
+		});
+      // let self = this;
+      // if(type == 1){
+      //   uni.navigateTo({
+      //     url: '/pages_student/mine/creditPoints',
+      //   });
+      // }else if(type == 2){
+      //   uni.navigateTo({
+      //     url: '/pages_student/mine/rewardPoints',
+      //   });
+      // }else if(type == 3){
+      //   uni.scanCode({
+      //     onlyFromCamera: true,
+      //     success: function (res) {
+      //       uni.navigateTo({
+      //         url: '/pages_student/mine/codeSuccess?q='+encodeURIComponent(JSON.stringify(res.result))
+      //       });
+      //     }
+      //   });
+      // }
     },
     //获取个人信息
     async simpleInfo(){
@@ -196,7 +202,7 @@ export default {
         if(this.userType == 1){
           this.getSafeWarnList();
         }else if(this.userType == 2){
-          this.getMyPointsLogInfo();
+          //this.getMyPointsLogInfo();
         }
         if(data.data.count){
           this.adminSubCount = data.data.count.adminSubCount;