通告修改文字

合同作废修改权限

components/My_switch/index.scss

@@ -6,7 +6,7 @@
     background: #F5F5F5;
     border-radius: 30rpx;
 
-    view {
+    .view {
         flex: 1;
         height: 60rpx;
         text-align: center;

components/My_switch/index.wxml

@@ -1,4 +1,4 @@
 <view class="switch-box">
-    <view class="bg" animation="{{animationData}}" />
-    <view class="{{checkedItem==index?'active':''}}" wx:for="{{list}}" wx:key="{{item}}" wx:if="{{index<2}}" bindtap="changeSwitch">{{item}}</view>
+    <view class="bg view" animation="{{animationData}}" />
+    <view class="{{checkedItem==index?'active':''}} view" wx:for="{{list}}" wx:key="{{item}}" wx:if="{{index<2}}" bindtap="changeSwitch">{{item}}</view>
 </view>

components/Yl_Headline/index.scss

@@ -0,0 +1,38 @@
+.box {
+  display: flex;
+  align-items: center;
+  width: 100vw;
+  height: 90rpx;
+  padding: 0 30rpx;
+  box-sizing: border-box;
+
+  .title {
+    font-size: 30rpx;
+    font-family: PingFang SC-Bold, PingFang SC;
+    font-weight: bold;
+    color: #333333;
+    flex-shrink: 0;
+  }
+
+  .rep {
+    flex: 1;
+    height: 100%;
+    margin-left: 20rpx;
+
+    .switch {
+      height: 100%;
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+
+      .text {
+        font-size: 28rpx;
+        font-family: PingFang SC-Regular, PingFang SC;
+        color: #999999;
+        margin-right: 10rpx;
+        height: 100%;
+        line-height: 84rpx;
+      }
+    }
+  }
+}

components/Yl_Headline/index.wxml

@@ -2,7 +2,7 @@
   <view class="title">{{title}}</view>
   <view class="rep">
     <view class="switch" wx:if="{{type=='switch'}}">
-      <text catchtap='changeSwitch'>{{switchLabel}}</text>
+      <text class="text" catchtap='changeSwitch'>{{switchLabel}}</text>
       <van-switch checked="{{ switch }}" size='44rpx' catchtap='changeSwitch' />
     </view>
     <slot wx:else />

components/Yl_Headline/index.wxss

@@ -1,38 +0,0 @@
-.box {
-  display: flex;
-  align-items: center;
-  width: 100vw;
-  height: 90rpx;
-  padding: 0 30rpx;
-  box-sizing: border-box;
-}
-
-.box .title {
-  font-size: 30rpx;
-  font-family: PingFang SC-Bold, PingFang SC;
-  font-weight: bold;
-  color: #333333;
-  flex-shrink: 0;
-}
-
-.box .rep {
-  flex: 1;
-  height: 100%;
-  margin-left: 20rpx;
-}
-
-.box .rep .switch {
-  height: 100%;
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-}
-
-.box .rep .switch text {
-  font-size: 28rpx;
-  font-family: PingFang SC-Regular, PingFang SC;
-  color: #999999;
-  margin-right: 10rpx;
-  height: 100%;
-  line-height: 84rpx;
-}

packageA/contract/detail.js

@@ -197,17 +197,16 @@ Page({
                 label: "反审核"
             })
         }
-
+        /* {
+            icon: "icon-shanchu",
+            label: "作废"
+        } */
         if (status != '已终止' && status != '已过期') {
             if (isLeader || isAdmin) {
                 if (editdataleader) tabbarList.unshift({
                     icon: "icon-zhuanyi",
                     label: "更换负责人"
                 });
-                tabbarList = [{
-                    icon: "icon-shanchu",
-                    label: "作废"
-                }].concat(tabbarList)
                 if (status == '新建') {
                     tabbarList.push({
                         icon: "icon-bianji",
@@ -229,12 +228,14 @@ Page({
                     })
                 }
             };
-        } else {
-            tabbarList = [{
-                icon: "icon-shanchu",
-                label: "作废"
-            }];
         }
+
+        if (isLeader && status != '已提交' && status != '审核') tabbarList.push({
+            icon: "icon-shanchu",
+            label: "作废"
+        })
+
+
         this.setData({
             isLeader,
             tabbarList,
@@ -698,7 +699,7 @@ Page({
                 break;
             case "作废":
                 wx.navigateTo({
-                  url: '/packageA/contract/delete?id='+this.data.detail.sa_contractid,
+                    url: '/packageA/contract/delete?id=' + this.data.detail.sa_contractid,
                 })
                 break;
             case "编辑":

packageA/contract/detail.wxml

@@ -24,5 +24,4 @@
     <view style="height: 140rpx;" />
 </Yl_FunTabs>
 <!-- 底部 -->
-<Yl_Tabbar list='{{tabbarList}}' bind:callback="tabbarOnClick" />
-<wxs src='../../utils/wxmlQueryPer.wxs' module="per" />
+<Yl_Tabbar list='{{tabbarList}}' bind:callback="tabbarOnClick" />

pages/annunciate/index.js

@@ -14,7 +14,7 @@ Page({
         },
         unreadNum: 0,
         filtratelist: [{
-            label: "板块",
+            label: "版块",
             index: null,
             showName: "classname", //显示字段
             valueKey: "sat_notice_classid", //返回Key