0807

views/home/src/projects/final/views/login/index.vue

@@ -13,14 +13,9 @@
         icon-prefix="my-icon"
         icon="weixin"
         @click="weixinLogin"
-        >微信授权登录</van-button
-      >
-      <p
-        class="mt-4 text-gray-400 text-sm"
-        style="font-size: 1rem; line-height: 2rem"
-        @click="mimaLogin"
-      >
-        账号密码登录
+        >微信授权登录</van-button>
+      <p class="mt-4  text-sm" style="font-size: 1rem; line-height: 2rem"  @click="mimaLogin" >
+        账号密码登录13000+11000+50000+15000
       </p>
     </div>
     <van-form v-if="!showLoginType" @submit="onSubmit">
@@ -83,7 +78,7 @@ export default {
       wxID: 1,
       code: "",
       loginLoading: false,
-      showLoginType: true,
+      showLoginType: false,
       countDownTime: 60000,
       loginForm: {
         phone: "",
@@ -132,6 +127,7 @@ export default {
   },
   methods: {
     weixinLogin() {
+
       this.loginForm.login_type = 1;
       getOauthUrl(this.wxID, {
         scope: "snsapi_userinfo",
@@ -169,6 +165,10 @@ export default {
     },
     onSubmit() {
       this.loginLoading = true;
+      
+      this.loginForm.login_type = 2;
+      this.showLoginType = false;
+
       adminLogin;
       this.$store
         .dispatch("user/login", this.loginForm)

views/home/src/projects/final/views/worksite/Detail.vue

@@ -255,9 +255,10 @@
                     </div>
                     <div v-else>
                       <div class="text-right">
-                        <van-button class="ml-2" type="primary" size="small" v-if="item.item_status == 0" @click="confirmSite(item.pick_name,item.id)">完工提交</van-button>
-                        <van-button class="ml-2" type="primary" size="small" v-if="item.item_status == 3" @click="confirmSite(item.pick_name,item.id)">重新提交</van-button>
-                        <van-button class="ml-2" size="small" type="danger"  v-if="item.worker_id == 0"  :to="`/table/${worksite.id}/worker?work_id=${item.id}`">立即派单</van-button>
+                        <!-- {{userId}}重新提交{{ worksite.manager_id }} -->
+                        <van-button class="ml-2" type="primary" size="small" v-if="item.item_status == 0 && userId == worksite.manager_id" @click="confirmSite(item.pick_name,item.id)">完工提交</van-button>
+                        <van-button class="ml-2" type="primary" size="small" v-if="(item.item_status == 3) && (userId == worksite.manager_id)" @click="confirmSite(item.pick_name,item.id)">重新提交</van-button>
+                        <van-button class="ml-2" size="small" type="danger"  v-if="item.worker_id == 0 && userId == worksite.manager_id"  :to="`/table/${worksite.id}/worker?work_id=${item.id}`">立即派单</van-button>
                         <van-button class="ml-2" type="primary" size="small"  @click="confirmMsg(item.pick_name,item.id)">留言</van-button>
                         <!-- <van-button class="ml-2" type="danger" size="small" v-if="item.manager_status == 0" @click="extensionRequest(item.pick_name,item.id)">延期申请</van-button> -->
                       </div>
@@ -470,6 +471,7 @@ export default {
       settlesShow: false,
       selectMats: [],
       worker:"",
+      userId: 0,
       selectMatState: {
         [-1]: "已取消",
         0: "待下单",
@@ -478,12 +480,15 @@ export default {
       payments: [],
     };
   },
+
   created() {
     this.supplier = this.$store.getters.supplier;
     if (this.$route.params && this.$route.params.id) {
       this.id = this.$route.params.id;
     }
-  
+    this.userId = this.$store.getters.user_id;
+    console.log("this.userId2",this.$store.getters.user_id)
+    console.log("this.userId2",this.userId )
     this.loadWorksite();
     console.log("get table key:",sessionStorage.getItem('managerTab'))
     if (sessionStorage.getItem('managerTab')){