Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/components/serviceRemind/index.vue

@@ -0,0 +1,50 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" width="700">
+    <div class="serviceTitle" slot="title">
+      服务到期提醒
+    </div>
+
+    
+    <el-form :model="form">
+      <el-form-item label="活动名称" :label-width="formLabelWidth">
+        <el-input v-model="form.name" autocomplete="off"></el-input>
+      </el-form-item>
+      <el-form-item label="活动区域" :label-width="formLabelWidth">
+        <el-select v-model="form.region" placeholder="请选择活动区域">
+          <el-option label="区域一" value="shanghai"></el-option>
+          <el-option label="区域二" value="beijing"></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'serviceRemind',
+  data() {
+    return {
+      dialogFormVisible: true,
+      form: {
+        name: null,
+        region: null
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+/deep/.el-dialog {
+  background: url('./header_bg.png') no-repeat top center #fff;
+  background-size: 100% auto;
+  border-radius: 6px;
+  overflow: hidden;
+  .el-dialog__header {
+    background: transparent;
+    .el-dialog__headerbtn .el-dialog__close {
+      color: #000000;
+    }
+  }
+}
+</style>

src/views/productService/index.vue

@@ -78,12 +78,15 @@
           <cloud-recharge v-if="activeIndex == 2" />
         </el-tab-pane>
       </tab-router>
+
+    <!-- <serviceRemind /> -->
     </div>
   </div>
 </template>
 <script>
 import cloudRecharge from '@/views/productService/components/cloudRecharge'
 import serviceRenew from '@/views/productService/components/serviceRenew'
+import serviceRemind from '@/components/serviceRemind'
 import { permission } from "@/utils/directivePage";
 import { queryTenantInfoSumm } from "./api";
 import dayjs from 'dayjs'
@@ -91,7 +94,8 @@ import dayjs from 'dayjs'
 export default {
   components: {
     cloudRecharge,
-    serviceRenew
+    serviceRenew,
+    serviceRemind
   },
   name: "productService",
   data() {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -295,9 +295,9 @@
               :label="item.userId"
               :value="item.userName"
             >
-              <span style="float: left">{{ item.userId }}</span>
+              <span style="float: left">{{ item.userName }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{
-                String(userName)
+                String(item.userId)
               }}</span>
             </el-option>
           </el-select>