Z: Dot: PC: Change Homepage's router.

ybf_admin/src/api/jinjian.js

@@ -17,4 +17,10 @@ export function getOrgTree(data) {
       method: 'post',
       data: data
     })
+  }
+  export function getHistoryList() {
+    return request({
+      url: '/admin/auth/addressbook/synchronization',
+      method: 'get',
+    })
   }
\ No newline at end of file

ybf_admin/src/pages/in/contact/components/addCounter.vue

@@ -209,6 +209,9 @@ export default {
 .cs {
   display: flex;
 }
+.ct >>> .el-transfer-panel {
+  width: 180px;
+}
 .choose {
   padding: 16px;
   font-size: 16px;
@@ -220,7 +223,6 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  /* border-bottom: 1px solid #f8f8f8; */
   padding-bottom: 10px;
 }
 .transfer-footer {
@@ -233,9 +235,6 @@ export default {
 .ct >>> .el-dialog__body {
   padding: 0;
 }
-.ct >>> .el-transfer-panel {
-  width: 250px;
-}
 .circle {
   width: 30px;
   height: 30px;

ybf_admin/src/pages/in/contact/components/history.vue

@@ -2,7 +2,9 @@
   <div class="main">
     <div class="titles" style="height:40px;">
       <span>同步成员历史</span>
-      <el-button class="button buttondark" size="small" @click="handleCancel">返回</el-button>
+      <el-button class="button buttondark" size="small" @click="handleCancel"
+        >返回</el-button
+      >
     </div>
     <div class="lists">
       <el-table
@@ -15,7 +17,12 @@
         :header-cell-style="setListsHeadStyle"
         height="calc(100vh - 300px)"
       >
-        <el-table-column label="序号" width="70" type="index" align="center"></el-table-column>
+        <el-table-column
+          label="序号"
+          width="70"
+          type="index"
+          align="center"
+        ></el-table-column>
         <el-table-column
           prop="taskType"
           label="姓名"
@@ -42,20 +49,21 @@
     </div>
     <div class="pages">
       <el-pagination
-        @size-change="pagesSizeChange"
-        @current-change="pagesNowPageChange"
-        :current-page="currentPage4"
-        :page-sizes="[100, 200, 300, 400]"
-        :page-size="100"
-        layout="prev, pager, next, sizes, jumper"
-        :total="400"
-      ></el-pagination>
+        @current-change="handleCurrentChange"
+        :current-page="page.currentPage"
+        :page-size="page.size"
+        layout="total, prev, pager, next, jumper"
+        :total="page.total"
+      >
+      </el-pagination>
     </div>
   </div>
 </template>
 <script>
+import { getHistoryList } from "@/api/jinjian"
 export default {
-  data () {
+  
+  data() {
     return {
       list: {
         main: [
@@ -166,28 +174,36 @@ export default {
           nowPageNum: 4
         }
       },
-      isShow: true
-    }
+      isShow: true,
+      page: {
+        currentPage: 1,
+        size: 20,
+        total: 100
+      },
+    };
   },
-  created () {},
+  created() {},
   methods: {
-    listPick () {},
-    testButtonClick () {},
-    pagesSizeChange () {},
-    pagesNowPageChange () {},
-    setListsHeadStyle ({ row, column, rowIndex, columnIndex }) {
+    getList() {
+      getHistoryList().then(res => {
+        console.log(res,"res");
+        
+      })
+    },
+    setListsHeadStyle({ row, column, rowIndex, columnIndex }) {
       if (rowIndex === 0) {
-        return "background-color: #0B0F32; border-right: 1px solid white;color: white;"
+        return "background-color: #0B0F32; border-right: 1px solid white;color: white;";
       } else {
-        return ''
+        return "";
       }
     },
-    handleCancel () {
-      this.isShow = false
-      this.$emit('isShow', false)
+    handleCurrentChange() {},
+    handleCancel() {
+      this.isShow = false;
+      this.$emit("isShow", false);
     }
   }
-}
+};
 </script>
 <style lang="scss" scoped>
 .titles {
@@ -199,9 +215,9 @@ export default {
   border-bottom: 1px solid #f8f8f8;
 }
 .btn {
-  font-size:14px;
-  font-weight:bold;
-  color:rgba(102,102,102,1);
+  font-size: 14px;
+  font-weight: bold;
+  color: rgba(102, 102, 102, 1);
 }
 .main {
   width: 100%;
@@ -269,5 +285,4 @@ export default {
   justify-content: flex-end;
   align-items: center;
 }
-
 </style>

ybf_admin/src/pages/in/contact/mail.vue

@@ -351,7 +351,6 @@ export default {
       data.children.push(newChild);
     },
     edit(data) {
-      console.log(1111);
       
     },
     remove(data) {
@@ -374,7 +373,6 @@ export default {
     },
     handleMove() {
       this.moveDialogShow = true;
-      console.log(111111);
     },
     removeFinish() {
       this.moveDialogShow = false;
@@ -389,13 +387,13 @@ export default {
       this.$refs.addStore.addStoreDialog = true;
     },
     getMailList() {
-      let data = {
+      /* let data = {
 
       }
       getMailList(data).then(res => {
         console.log(res,"通讯录表格数据");
         
-      })
+      }) */
     },
     handleShopowner() {
 

ybf_admin/src/router/index.js

@@ -32,7 +32,7 @@ const router = new VueRouter({
  * 路由拦截
  * 权限验证
  */
- router.beforeEach(async (to, from, next) => {
+router.beforeEach(async (to, from, next) => {
   // 确认已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
   await store.dispatch('d2admin/page/isLoaded')
   // 确认已经加载组件尺寸设置 https://github.com/d2-projects/d2-admin/issues/198
@@ -64,7 +64,7 @@ const router = new VueRouter({
     // 不需要身份校验 直接通过
     next()
   }
-}) 
+})  
 
 router.afterEach(to => {
   // 进度条

ybf_wx/src/views/active/createBigWheelActive.vue

@@ -272,7 +272,7 @@
               v-model="prizeList[index].startTime"
               type="date"
               @cancel="prizeList[index].startShow = false"
-              @confirm="handlePSTime(index)"
+              @confirm="prizeList[index].startShow = false"
               @change="startTimeChange2(prizeList[index].startTime, index)"
             />
           </van-popup>
@@ -298,7 +298,7 @@
               v-model="prizeList[index].endTime"
               type="date"
               @cancel="prizeList[index].endShow = false"
-              @confirm="handlePETime(index)"       
+              @confirm="prizeList[index].endShow = false"       
               @change="endTimeChange2(prizeList[index].endTime, index)"
             />
           </van-popup>
@@ -406,7 +406,7 @@ export default {
           fullMoney: "",
           fullShow: false,
           validity: "",
-          startTime: new Date(),
+          startTime: "",
           startTime1: "",
           startShow: false,
           endTime: "",
@@ -437,16 +437,12 @@ export default {
       let startTimeArr = e.getValues();      
       this.basicInfo.startTime1 = `${startTimeArr[0]}-${startTimeArr[1]}-${startTimeArr[2]}`;
     },
-    startTimeChange2(e, index) {
+    startTimeChange2(e, index) {     
       this.prizeList[index].startTime1 = this.timeFormat(e);
-    },
-    handlePSTime(index) {
-      this.prizeList[index].startShow=false
+    }, 
+     handlePSTime(index) {
       this.prizeList[index].startTime1 = this.timeFormat(this.confirmTime)
-    },
-    handlePETime(index) {
-      this.prizeList[index].endShow=false
-      this.prizeList[index].endTime1 = this.timeFormat(this.confirmTime)
+      this.prizeList[index].startShow=false    
     },
     timeFormat(time) {
       let year = 1900 + time.getYear();
@@ -458,10 +454,18 @@ export default {
     endTimeChange(e) {
       let endTimeArr = e.getValues();
       this.basicInfo.endTime1 = `${endTimeArr[0]}-${endTimeArr[1]}-${endTimeArr[2]}`;
+    },
+     handleBasicETime(value) {
+      this.basicInfo.endShow=false
+      this.basicInfo.endTime1 = this.timeFormat(value)
     },
     endTimeChange2(e, index) {
       this.prizeList[index].endTime1 = this.timeFormat(e);
     },
+    handlePETime(index) {
+      this.prizeList[index].endTime1 = this.timeFormat(this.confirmTime)   
+      this.prizeList[index].endShow=false        
+    },
     // 数字大写转小写
     numberToUpperCase(textIndex) {
       let newString = "";
@@ -544,10 +548,7 @@ export default {
       this.basicInfo.startShow=false
       this.basicInfo.startTime1 = this.timeFormat(value)
     },
-     handleBasicETime(value) {
-      this.basicInfo.endShow=false
-      this.basicInfo.endTime1 = this.timeFormat(value)
-    },
+    
   },
   mounted() {
     this.pTime = this.timeFormat(this.pTime)

ybf_wx/src/views/counter/counterMaintain.vue

@@ -61,7 +61,8 @@ export default {
       name: "",
       floor: "",
       fileList: [],
-      bannerList:[]
+      bannerList:[],
+      message: ""
     };
   }
 };