瀏覽代碼

意见反馈

codeMan 1 年之前
父節點
當前提交
a17c8f0f5f

+ 1 - 1
cloud/collect/mylist.vue

@@ -20,7 +20,7 @@
 
 <script>
 import imgList from '../../pages/index/index/casePages/modules/imgList.vue';
-import designList from '../../pages/index/index/casePages/modules/designList.vue';
+import designList from '../../components/designList.vue';
 import product from "../../components/collectLists/product.vue";
 import courseware from "../../components/collectLists/courseware.vue";
 import commodityList from "../../pages/index/index/modules/commodityList.vue";

+ 158 - 0
cloud/designReality/index.vue

@@ -0,0 +1,158 @@
+<template>
+    <view>
+         <u-tabs :scrollable="false" lineColor="#C30D23" :activeStyle="{ color: '#C30D23', fontWeight: 'bold' }"
+            :list="tabs" @click="changeCurrent" :current="current" />
+        <My_listbox ref="List" @getlist="getList" bottomHeight="70">
+            <designList ref="designList" :list="list" @toDetail="toDetail" showStatus />
+        </My_listbox>
+        <view class="footer">
+            <view class="add" hover-class="navigator" @click="toUpload">
+                上传
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+import designList from "../../components/designList";
+export default {
+    components: { designList },
+    data() {
+        return {
+            current: 0,
+            tabs: [{
+                name: '我的设计',
+            }, {
+                name: '我的实景',
+            }],
+            list: [],
+            "content": {
+                "where": {
+                    "condition": "",
+                    "type": 4 //4:设计,5:实景
+                }
+            }
+        }
+    },
+    onLoad(options) {
+        uni.setNavigationBarTitle({
+            title: '设计实景'
+        });
+        this.getList(true)
+    },
+    methods: {
+        getList(init = false) {
+            if (this.paging(this.content, init)) return;
+            this.$Http.basic({
+                "id": "2024052413361402",
+                content: this.content
+            }).then(res => {
+                console.log("我的设计实景列表", res)
+                this.$refs.List.RefreshToComplete()
+                if (this.cutoff(res.msg)) return;
+                res.data = this.$refs.designList.handleList(res.data)
+                this.list = res.pageNumber == 1 ? res.data : this.list.concat(res.data);
+                this.content = this.$refs.List.paging(this.content, res)
+            })
+        },
+        changeCurrent({ name }) {
+            this.content.where.type = name == '我的设计' ? 4 : 5;
+            this.getList(true)
+        },
+        updateList(data = null) {
+            if (this.content.pageNumber && this.content.pageNumber >= 2) {
+                let that = this;
+                let content = this.paging(this.content, true, true)
+                this.$Http.basic({
+                    "id": "2024052413361402",
+                    content
+                }).then(res => {
+                    console.log("更新列表", res)
+                    if (this.cutoff(res.msg)) return;
+                    res.data = res.data.map(v => {
+                        v.cover = v.attinfos.length ? this.getSpecifiedImage(v.attinfos.find(s => s.usetype == "sat_sharematerial") || v.attinfos[0]) : uni.getStorageSync("site").logo || ''
+                        return v
+                    })
+                    this.list = res.data;
+                    if (data) handle();
+                })
+                function handle() {
+                    uni.showModal({
+                        title: '提示',
+                        content: '新建成功,是否立即查看',
+                        cancelText: '返回列表',
+                        confirmText: '查看详情',
+                        success: ({ confirm }) => {
+                            if (confirm) {
+                                let index = that.list.findIndex(v => v.sat_sharematerialid == data.sat_sharematerialid);
+                                if (index == -1) {
+                                    uni.redirectTo({
+                                        url: `/packageA/fullView/detail?id=${data.sat_sharematerialid}`
+                                    });
+                                    that.$Http.setCount = null;
+                                } else {
+                                    that.toDetail(index, 2)
+                                }
+                            } else {
+                                uni.navigateBack();
+                            }
+                        },
+                    })
+                }
+            }
+        },
+        toDetail(index, type = 1) {
+            let item = this.list[index]
+            if (type == 1) {
+                uni.navigateTo({
+                    url: `/packageA/fullView/detail?id=${item.sat_sharematerialid}`,
+                });
+            } else {
+                uni.redirectTo({
+                    url: `/packageA/fullView/detail?id=${item.sat_sharematerialid}`,
+                });
+            }
+            this.$Http.setCount = function (detail) {
+                item.collectcount = detail.collectcount;
+                item.commentcount = detail.commentcount;
+                item.likecount = detail.likecount;
+                item.islike = detail.islike;
+                item.iscollect = detail.iscollect;
+                this.$set(this.list, index, item)
+            }.bind(this)
+        },
+        toUpload() {
+            uni.navigateTo({
+                url: '/packageA/fullView/upload?pageType=' + (this.content.where.type == 4 ? '设计' : '实景'),
+            })
+            this.$Http.updateList = this.updateList.bind(this);
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.footer {
+    position: fixed;
+    bottom: 0;
+    width: 100vw;
+    height: 65px;
+    background: #FFFFFF;
+    box-shadow: 0px -2px 6px 1px rgba(0, 0, 0, 0.16);
+    box-sizing: border-box;
+    padding: 5px 10px;
+    display: flex;
+
+    .add {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 45px;
+        background: #C30D23;
+        border-radius: 5px;
+        font-family: PingFang SC, PingFang SC;
+        font-size: 14px;
+        color: #FFFFFF;
+    }
+}
+</style>

+ 92 - 0
cloud/serviceAdmin/redskinsServiceAdmin.vue

@@ -0,0 +1,92 @@
+<template>
+    <view>
+      <view class="border-style" v-for="item in list" :key="item.rowindex">
+        <view style="padding: 10px">
+          <view class="content-style">
+            <u--image :src="item.attinfos[0].url" :width="tovw(355)" :height="tovw(180)"   :lazy-load="true">
+              <template v-slot:loading>
+                <u-loading-icon color="red"></u-loading-icon>
+              </template>
+            </u--image>
+          </view>
+        </view>
+        <view class="button-style">
+          <view>
+            <span style="color: #666666;font-size: 14px">状态:</span>
+            <span :style="{color: item.isonsale=='1'?'#E3041F':'#999999',fontSize: '14px'}">{{item.isonsale == '1'?'上架':'下架'}}</span>
+          </view>
+          <view style="width: 100px;height: 40px;line-height: 40px;margin-top:5px;vertical-align: middle">
+            <u-button :text="item.isonsale == '0'?'上架':'下架'" :color="item.isonsale == '0'?'#C30D23':'#999999'" @click="clickSale(item)"></u-button>
+          </view>
+
+        </view>
+      </view>
+    </view>
+</template>
+
+<script>
+export default {
+  data(){
+    return {
+      buttonText:'下架',
+      title:'',
+      list:[]
+    }
+  },
+  onLoad(options){
+    this.getList(true)
+    if (options.title){
+      this.title = options.title
+    }
+    uni.setNavigationBarTitle({
+      title:'6C红人服务管理'
+    })
+  },
+  methods:{
+    getList(init = false){
+      this.$Http.base({
+        "id": 20240511110302,
+        "content": {
+          "title": this.title?this.title:"6C红人服务"
+        },
+      }).then(res =>{
+        console.log(res.data,'红人服务管理')
+        this.list = res.data
+      })
+    },
+    clickSale(item){
+      console.log(item,'数据上下架')
+      this.$Http.base({
+        "id": 20240511133302,
+        "content": {
+          "linksids": [item.linksid],
+          "isonsale":item.isonsale == '1'?0:1
+        },
+      }).then(res =>{
+        this.getList(true)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+  .border-style{
+    height: 255px;
+    background: #FFFFFF;
+    border-radius: 0px 0px 0px 0px;
+    margin-bottom: 10px;
+    .content-style {
+      height: 180px;
+      border: 0px solid #707070;
+    }
+    .button-style {
+      padding: 0 10px 10px 10px ;
+      height: 45px;
+      line-height: 45px;
+      vertical-align: center;
+      display: flex;
+      justify-content: space-between;
+    }
+  }
+</style>

+ 18 - 2
components/My_search.vue

@@ -2,7 +2,7 @@
     <view class="search-box">
         <view class="search" :style="{ background: background || '#F2F2F2' }">
             <icon class="icon" type="search" size="3.733vw" />
-            <input v-model="value" class="input" :disabled="disabled" confirm-type="search"
+            <input :focus="inputFocus" v-model="value" class="input" :disabled="disabled" confirm-type="search"
                 placeholder-style="font-size:3.733vw;" :placeholder="placeholder" type="text"
                 @input="isInput ? onConfirm($event) : ''" @confirm="isInput ? '' : onConfirm($event)">
             <icon v-if="value" class="icon" type="clear" size="3.733vw" @click="onClear" />
@@ -18,9 +18,17 @@ export default {
             type: String,
             default: "搜索关键字"
         },
+        focus: {
+            type: Boolean,
+            default: true
+        },
         onSearch: {
             type: Function
         },
+        delay: {
+            type: [String, Number],
+            default: 350
+        },
         disabled: {
             type: Boolean,
             default: false
@@ -33,9 +41,17 @@ export default {
             default: false
         }
     },
+    watch: {
+        focus: function (newVal) {
+            setTimeout(() => {
+                this.inputFocus = newVal;
+            }, this.delay)
+        }
+    },
     data() {
         return {
-            value: ""
+            value: "",
+            inputFocus: false,
         }
     },
     methods: {

+ 29 - 3
pages/index/index/casePages/modules/designList.vue → components/designList.vue

@@ -1,10 +1,18 @@
 <template>
     <view>
 
-        <navigator class="list-item" url="#" v-for="(item, index) in list" hover-class="navigator-hover"
+        <navigator class="list-item" url="#" v-for="(item, index) in  list " hover-class="navigator-hover"
             :key="item.sat_coursewareid" @click="onClick(index)">
             <view style="position: relative;">
                 <image class="image" :src="item.cover" mode="aspectFill" lazy-load="true" />
+                <block v-if="showStatus">
+                    <view v-if="item.status == '发布'" class="status" style="background: #FFF0F2;color: #E3041F;">
+                        已审核
+                    </view>
+                    <view v-else class="status">
+                        未审核
+                    </view>
+                </block>
                 <view class="createby-box">
                     <image class="headpic"
                         :src="item.headpic || 'https://yossys06593.obs.cn-east-3.myhuaweicloud.com:443/202404231713854678447B26b4363.svg'"
@@ -27,12 +35,11 @@
                 </view>
             </view>
         </navigator>
-
     </view>
 </template>
 
 <script>
-import { formattedFiles } from "../../../../../utils/settleFiles"
+import { formattedFiles } from "../utils/settleFiles"
 export default {
     props: {
         list: {
@@ -40,6 +47,9 @@ export default {
         },
         toDetail: {
             type: Function
+        },
+        showStatus: {
+            type: Boolean
         }
     },
     methods: {
@@ -72,6 +82,22 @@ export default {
         overflow: hidden;
     }
 
+    .status {
+        position: absolute;
+        top: 10px;
+        right: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 56px;
+        height: 24px;
+        background: #E3041F;
+        border-radius: 12px 0px 0px 12px;
+        font-family: Source Han Sans SC, Source Han Sans SC;
+        font-size: 12px;
+        color: #FFFFFF;
+    }
+
     .createby-box {
         position: absolute;
         display: flex;

+ 7 - 2
components/filtrate-group.vue

@@ -44,6 +44,7 @@ export default {
 <style lang="scss">
 .group-box {
     padding: 10px;
+    padding-left: 0px;
     box-sizing: border-box;
 
     .title {
@@ -52,20 +53,24 @@ export default {
         font-weight: bold;
         font-size: 16px;
         color: #333333;
+        box-sizing: border-box;
+        padding-left: 10px;
     }
 
     .options {
         display: flex;
         flex-wrap: wrap;
+        box-sizing: border-box;
+        padding-left: 5px;
 
         .option {
-            min-width: 80px;
+            min-width: 72px;
             padding: 6px;
             font-family: PingFang SC, PingFang SC;
             text-align: center;
             font-size: 14px;
             color: #333333;
-            margin: 10px 5px 0 0;
+            margin: 10px 0 0 5px;
             background: #F2F2F2;
             border-radius: 5px;
         }

+ 49 - 30
components/my_form.vue

@@ -229,27 +229,30 @@
                 <!-- 标签 -->
                 <view class="tag-box custom-class-box " v-else-if="item.type == 'tag'"
                     :style="{ marginTop: tovw(item.marginTop || 0) }">
-                        <text class="label">{{ item.label }}</text>
-                        <view class="tag-list">
-                            <view class="tag" v-for="tag in item.value" :key="tag">
-                                <text>{{tag}}</text>
-                                <view @click="delTag(tag,index)" class="del">x</view>
-                            </view>
-                            <view>
-                                <u-modal :title="item.label" :show="showTagModal" style="flex: 0 !important;" confirmColor='#C30D23' ref="uModal" showCancelButton :asyncClose="false"
-                                    @confirm="addTagSend(index)" @cancel="showTagModal = false">
-                                    <view class="slot-content">
-                                        <view v-if="item.errText" class="err-text" style="margin-bottom: 10px;">
-                                            <icon class="icon" color="#E3041F" type="clear" size="2.733vw" />
-                                            {{ item.errText }}
-                                        </view>
-                                        <u--input :focus="showUModal" @input="onTagInput($event, index)" :placeholder="item.placeholder || '请输入'" v-model="tagValue" border="bottom" clearable />
+                    <text class="label">{{ item.label }}</text>
+                    <view class="tag-list">
+                        <view class="tag" v-for="tag in item.value" :key="tag">
+                            <text>{{ tag }}</text>
+                            <view @click="delTag(tag, index)" class="del">x</view>
+                        </view>
+                        <view>
+                            <u-modal :title="item.label" :show="showTagModal" style="flex: 0 !important;"
+                                confirmColor='#C30D23' ref="uModal" showCancelButton :asyncClose="false"
+                                @confirm="addTagSend(index)" @cancel="showTagModal = false">
+                                <view class="slot-content">
+                                    <view v-if="item.errText" class="err-text" style="margin-bottom: 10px;">
+                                        <icon class="icon" color="#E3041F" type="clear" size="2.733vw" />
+                                        {{ item.errText }}
                                     </view>
-                                </u-modal>
-                                <view class="add-tag" @click="showTagModal=true">+ 添加</view>
-                            </view>
-                            
+                                    <u--input :focus="showUModal" @input="onTagInput($event, index)"
+                                        :placeholder="item.placeholder || '请输入'" v-model="tagValue" border="bottom"
+                                        clearable />
+                                </view>
+                            </u-modal>
+                            <view class="add-tag" @click="showTagModal = true">+ 添加</view>
                         </view>
+
+                    </view>
                 </view>
             </block>
         </block>
@@ -287,8 +290,8 @@ export default {
             list: [],
             focusLabel: "",
             unShowAll: false,
-            showTagModal:false,
-            tagValue:''
+            showTagModal: false,
+            tagValue: ''
         }
     },
     watch: {
@@ -363,13 +366,13 @@ export default {
             }] */
     },
     methods: {
-        delTag (tag,index) {
+        delTag(tag, index) {
             let item = this.list[index];
             console.log(tag);
-            item.value.splice(item.value.indexOf(tag),1)
+            item.value.splice(item.value.indexOf(tag), 1)
             this.$set(this.list[index], 'value', item.value)
         },
-        addTagSend (index) {
+        addTagSend(index) {
             let item = this.list[index]
             if (!item.errText) {
                 item.value.push(this.tagValue)
@@ -379,8 +382,16 @@ export default {
             }
         },
         toRoute(item, index) {
+            let url = item.path;
+            if (item.showValue.length) {
+                let obj = JSON.stringify({
+                    value: item.value,
+                    showValue: item.showValue
+                })
+                url += (url.indexOf("?") == -1 ? '?alreadySelecteds=' : '&alreadySelecteds=') + obj
+            }
             uni.navigateTo({
-                url: item.path
+                url
             });
             this.$Http.routeSelected = function (selected) {
                 this.$emit('interrupt', item, selected, index)
@@ -894,6 +905,7 @@ export default {
     }
 
 }
+
 .tag-box {
     .label {
         width: 100px;
@@ -903,18 +915,21 @@ export default {
         font-size: 14px;
         color: #666666;
         flex-shrink: 0;
+
         .must {
             color: #E3041F;
             margin-right: 5px;
         }
     }
-    .tag-list{
+
+    .tag-list {
         display: flex;
         align-content: center;
         align-items: center;
         flex-wrap: wrap;
         font-family: PingFang SC, PingFang SC;
-        margin-top:10px;
+        margin-top: 10px;
+
         .err-text {
             font-size: 12px;
             color: #E3041F;
@@ -924,6 +939,7 @@ export default {
                 margin-right: 2px;
             }
         }
+
         .tag {
             padding: 6px 10px;
             background: #F2F2F2;
@@ -936,22 +952,25 @@ export default {
             display: flex;
             align-items: center;
             align-content: center;
-            text-align:center;
+            text-align: center;
+
             &:last-child {
                 margin-right: 0 !important;
             }
+
             .del {
                 margin-left: 10px;
                 padding: 2px;
             }
         }
+
         .add-tag {
             border-radius: 5px 5px 5px 5px;
             border: 1px dashed #C30D23;
             padding: 6px 20px;
-            color:#C30D23;
+            color: #C30D23;
             font-weight: 400;
-            margin-bottom:10px;
+            margin-bottom: 10px;
             font-size: 14px;
         }
     }

+ 24 - 3
team/team/modules/userList.vue → components/userList.vue

@@ -1,6 +1,7 @@
 <template>
     <view>
-        <view class="item" v-for="item in list" :key="item.userid" hover-class="navigator-hover" @click="itemClick(item)">
+        <view class="item" v-for="item in list" :key="item.sys_enterprise_hrid" hover-class="navigator-hover"
+            @click="itemClick(item)">
             <u--image
                 :src="item.headpic || 'https://yossys06593.obs.cn-east-3.myhuaweicloud.com:443/202404231713854678447B26b4363.svg'"
                 :width="tovw(44)" :height="tovw(44)" shape="circle">
@@ -12,7 +13,7 @@
                 <view class="title u-line-1">
                     {{ item.name }}
                 </view>
-                <view class="row u-line-1">
+                <view v-if="item.rolenames" class="row u-line-1">
                     {{ item.rolenames }}
                 </view>
                 <view class="row">
@@ -30,6 +31,7 @@
                     </text>
                 </view>
             </view>
+            <view v-if="isDelete" class="iconfont icon-shanchu detele" @click.stop="deleteItem(item)" />
         </view>
     </view>
 </template>
@@ -43,11 +45,21 @@ export default {
         },
         onClick: {
             type: Function
-        }
+        },
+        isDelete: {
+            type: Boolean,
+            default: false
+        },
+        onDelete: {
+            type: Function
+        },
     },
     methods: {
         itemClick(item) {
             this.$emit("onClick", item)
+        },
+        deleteItem(item) {
+            this.$emit("onDelete", item)
         }
     },
 }
@@ -55,6 +67,7 @@ export default {
 
 <style lang="scss" scoped>
 .item {
+    position: relative;
     width: 355px;
     background: #FFFFFF;
     border-radius: 8px;
@@ -88,6 +101,14 @@ export default {
         }
     }
 
+    .detele {
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        padding: 10px;
+        color: #999999;
+        font-size: 14px;
+    }
 }
 
 .item:last-child {

File diff suppressed because it is too large
+ 1127 - 24
package-lock.json


+ 1 - 1
packageA/dailyYttendance/makePoster.vue

@@ -168,7 +168,7 @@ export default {
                                 showCancel: false
                             })
                             that.loading = false;
-                            this.$Http.basic({
+                            that.$Http.basic({
                                 "id": 20240319142702,
                                 "content": {
                                     sat_sharematerialid: that.detail.sat_sharematerialid, type: 1

+ 1 - 2
packageA/fullView/detail.vue

@@ -52,11 +52,10 @@
                             @click="delectComment(item)" />
                     </view>
                 </view>
-                <view v-if="comments.length == 0" style="padding-bottom: 25px;">
+                <view v-if="comments.length == 0" style="padding-bottom: 200px;">
                     <u-empty mode="data" />
                 </view>
             </view>
-
         </My_listbox>
 
         <view class="footer">

+ 2 - 1
packageA/fullView/upload.vue

@@ -76,7 +76,7 @@ export default {
                 type: "upload",
                 label: "图片/视频",
                 placeholder: "可上传多个视频或图片",
-                accept: "all",
+                accept: "media",
                 ownertable: "temporary",
                 ownerid: 999,
                 usetype: 'default',
@@ -148,6 +148,7 @@ export default {
                             })
                         })
                     };
+                    console.log("updateList", this.$Http.updateList)
                     if (this.$Http.updateList) return this.$Http.updateList(res.data);
                     uni.showModal({
                         title: '提示',

+ 1 - 1
packageCase/electricAppliances/index.vue

@@ -8,7 +8,7 @@
         </u-tabs>
         <u-transition :show="searchShow">
             <view class="My_search-box">
-                <My_search :value="content.where.condition" @onSearch="onSearch">
+                <My_search :focus="searchShow" :value="content.where.condition" @onSearch="onSearch">
                     <view class="cancel" v-if="content.where.condition" hover-class="navigator-hover" @click="onSearch('')">
                         取消
                     </view>

+ 8 - 0
pages.json

@@ -76,6 +76,8 @@
 			"path": "storeQRCode/index"
 		}, {
 			"path": "insert/store"
+		}, {
+			"path": "insert/member"
 		}, {
 			"path": "center/detail"
 		}]
@@ -112,6 +114,10 @@
 			"path": "feedback/detail"
 		}, {
 			"path": "feedback/insert"
+		}, {
+			"path": "serviceAdmin/redskinsServiceAdmin"
+		}, {
+			"path": "designReality/index"
 		}]
 	}, {
 		"root": "team",
@@ -143,6 +149,8 @@
 			"path": "store/store"
 		}, {
 			"path": "place/index"
+		}, {
+			"path": "roleid/roleid"
 		}]
 	}],
 	"preloadRule": {

+ 1 - 1
pages/index/cloud/product.vue

@@ -8,7 +8,7 @@
         </u-tabs>
         <u-transition :show="searchShow">
             <view class="My_search-box">
-                <My_search :value="content.where.condition" @onSearch="onSearch">
+                <My_search :focus="searchShow" :value="content.where.condition" @onSearch="onSearch">
                     <view class="cancel" v-if="content.where.condition" hover-class="navigator-hover" @click="onSearch('')">
                         取消
                     </view>

+ 1 - 1
pages/index/index/casePages/design.vue

@@ -10,7 +10,7 @@
 
 <script>
 import tabs from "./tabs.vue"
-import designList from "./modules/designList.vue";
+import designList from "../../../../components/designList.vue";
 
 export default {
     components: { tabs, designList },

+ 1 - 1
pages/index/index/index.vue

@@ -359,7 +359,7 @@ export default {
         width: 100vw;
         height: 50px;
         background: #FFFFFF;
-        box-shadow: inset 0px -1px 0px 1px #DDDDDD;
+        border-bottom: 0.5px solid #ddd;
         font-family: Source Han Sans SC, Source Han Sans SC;
         font-size: 16px;
         color: #333333;

+ 19 - 0
pages/index/index/videoDetail.vue

@@ -0,0 +1,19 @@
+<!--  -->
+<template>
+  <div>
+    11111111111
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+    }
+  }
+}
+</script>
+
+<style  scoped>
+
+</style>

+ 169 - 0
select/roleid/roleid.vue

@@ -0,0 +1,169 @@
+<template>
+    <view>
+        <view class="head">
+            请选择角色
+        </view>
+        <My_listbox ref="List" @getlist="getList" bottomHeight="70">
+            <view class="item" hover-class="navigator-hover" v-for="item in list" :key="item.roleid"
+                @click="selectItem(item)">
+                <view class="checkbox-box">
+                    <checkbox :checked="selectList.some(v => v == item.roleid)" color="#3874F6"
+                        style="transform:scale(0.7)" />
+                </view>
+                <view class="name u-line-1">
+                    {{ item.rolename || '--' }}
+                </view>
+            </view>
+        </My_listbox>
+        <view class="footer">
+            <view class="total">
+                已选:{{ selectList.length }}
+            </view>
+            <view class="confirm" :class="selectList.length ? '' : 'forbidden'" @click="selectList.length ? submit() : ''">
+                确定
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            list: [],
+            "content": {
+                "where": {
+                    "sys_enterprise_hrid": 0
+                }
+            },
+            selectList: [],
+            results: [],
+        }
+    },
+    onLoad(options) {
+        console.log("options", options)
+        uni.setNavigationBarTitle({
+            title: options.title || '选择角色'
+        });
+        if (options.sys_enterprise_hrid) this.content.where.sys_enterprise_hrid = options.sys_enterprise_hrid;
+        if (options.alreadySelecteds) {
+            const alreadySelecteds = JSON.parse(options.alreadySelecteds);
+            this.selectList = alreadySelecteds.value;
+            this.results = alreadySelecteds.value.map((v, i) => {
+                return {
+                    roleid: v,
+                    rolename: alreadySelecteds.showValue[i]
+                }
+            });
+        }
+        this.getList()
+    },
+    methods: {
+        getList(init = false) {
+            if (this.paging(this.content, init)) return;
+            this.$Http.basic({
+                "id": 20240411110602,
+                content: this.content
+            }).then(res => {
+                this.$refs.List.RefreshToComplete()
+                console.log("获取角色列表", res)
+                if (this.cutoff(res.msg)) return;
+                this.list = res.pageNumber == 1 ? res.data : this.list.concat(res.data);
+
+                this.content = this.$refs.List.paging(this.content, res)
+            })
+        },
+        selectItem(item) {
+            let index = this.selectList.findIndex(v => v == item.roleid);
+            if (index == -1) {
+                this.selectList.push(item.roleid)
+                this.results.push(item)
+            } else {
+                this.selectList.splice(index, 1);
+                this.results.splice(index, 1);
+            }
+        },
+        submit() {
+            this.$Http.routeSelected({
+                value: this.selectList,
+                showValue: this.results.map(v => v.rolename)
+            })
+        }
+    },
+
+}
+</script>
+
+<style lang="scss" scoped>
+.head {
+    line-height: 17px;
+    font-family: Source Han Sans SC, Source Han Sans SC;
+    font-size: 12px;
+    color: #666666;
+    padding: 10px;
+}
+
+.item {
+    display: flex;
+    align-items: center;
+    height: 50px;
+    background: #fff;
+
+    .checkbox-box {
+        display: flex;
+        justify-content: center;
+        width: 44px;
+        flex-shrink: 0;
+    }
+
+    .name {
+        height: 50px;
+        line-height: 50px;
+        width: 100%;
+        box-sizing: border-box;
+        border-bottom: 0.5px solid #ddd;
+        font-family: PingFang SC, PingFang SC;
+        font-size: 14px;
+        color: #333333;
+        padding-right: 10px;
+    }
+}
+
+
+.footer {
+    position: fixed;
+    bottom: 0;
+    width: 100vw;
+    height: 65px;
+    background: #FFFFFF;
+    box-shadow: 0px -2px 6px 1px rgba(0, 0, 0, 0.16);
+    box-sizing: border-box;
+    padding: 5px 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .total {
+        line-height: 45px;
+        font-family: PingFang SC, PingFang SC;
+        font-size: 14px;
+        color: #333333;
+    }
+
+    .confirm {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 112px;
+        height: 45px;
+        background: #C30D23;
+        border-radius: 5px;
+        font-family: PingFang SC, PingFang SC;
+        font-size: 14px;
+        color: #FFFFFF;
+    }
+
+    .forbidden {
+        opacity: .6;
+    }
+}
+</style>

+ 13 - 3
select/store/store.vue

@@ -77,11 +77,21 @@ export default {
             results: [],
         }
     },
-    onLoad() {
-        this.getList()
+    onLoad(options) {
         uni.setNavigationBarTitle({
-            title: '选择门店'
+            title: options.title || '选择门店'
         });
+        if (options.alreadySelecteds) {
+            const alreadySelecteds = JSON.parse(options.alreadySelecteds);
+            this.selectList = alreadySelecteds.value;
+            this.results = alreadySelecteds.value.map((v, i) => {
+                return {
+                    sa_storeid: v,
+                    storename: alreadySelecteds.showValue[i]
+                }
+            });
+        }
+        this.getList()
     },
     methods: {
         getList(init = false) {

+ 7 - 3
static/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4131149 */
-  src: url('//at.alicdn.com/t/c/font_4131149_od1w04hipjs.woff2?t=1715924322036') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4131149_od1w04hipjs.woff?t=1715924322036') format('woff'),
-       url('//at.alicdn.com/t/c/font_4131149_od1w04hipjs.ttf?t=1715924322036') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_4131149_4al2qsdn077.woff2?t=1716534997648') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4131149_4al2qsdn077.woff?t=1716534997648') format('woff'),
+       url('//at.alicdn.com/t/c/font_4131149_4al2qsdn077.ttf?t=1716534997648') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-xinzeng:before {
+  content: "\e6df";
+}
+
 .icon-shouji_xian:before {
   content: "\e6de";
 }

+ 192 - 18
store/center/detail.vue

@@ -5,10 +5,10 @@
             <view class="content">
                 <view class="left">
                     <view class="tag-box">
-                        <view class="storetype">
+                        <view v-if="detail.storetype" class="storetype">
                             {{ detail.storetype }}
                         </view>
-                        <view class="markettype">
+                        <view v-if="detail.markettype" class="markettype">
                             {{ detail.markettype }}
                         </view>
                     </view>
@@ -26,7 +26,7 @@
                         {{ getCity(detail) }}
                     </view>
                     <view class="row">
-                        状态:<text style="color: #333333;">{{ detail.status }}</text>
+                        状态:<text :style="{ color: detail.color }">{{ detail.status }}</text>
                     </view>
                 </view>
                 <view class="right">
@@ -42,48 +42,94 @@
             @click="changeCurrent" :current="current" />
         <view v-show="current == 0">
             <displayCell :showList="showList" :detail="detail" />
+            <view :style="{ height: detail.status == '审核' ? '30px' : '75px' }" />
         </view>
-        <block v-if="detail.status != '审核'">
-            <view style="height: 75px;" />
-            <view class="footer">
-                <view class="insert" :class="detail.status == '新建' ? '' : 'forbidden'"
-                    @click="detail.status == '新建' ? toEdit() : ''">
-                    编辑门店信息
-                </view>
 
-                <view class="invite" @click="detail.status == '新建' ? submit() : revocation()">
-                    {{ detail.status == '新建' ? '提交门店信息' : '撤回' }}
+        <view v-show="current == 1">
+            <view class="user-head">
+                <view class="title">
+                    门店人员
+                </view>
+                <view class="funs">
+                    <view class="item" hover-class="navigator" @click="changeSearchShow">
+                        <text class="iconfont icon-sousuo" />
+                    </view>
+                    <navigator v-if="authOption.includes('storeInsertUser')" class="item" @click="onInsert"
+                        :url="'/store/insert/member?id=' + detail.sa_storeid">
+                        <text class="iconfont icon-xinzeng" />
+                    </navigator>
+                </view>
+            </view>
+            <u-transition :show="searchShow">
+                <view class="My_search-box">
+                    <My_search :focus="searchShow" :value="content.where.condition" @onSearch="onSearch" />
                 </view>
+            </u-transition>
+            <My_listbox ref="List" @getlist="getList" :bottomHeight="detail.status != '审核' ? 70 : 30">
+                <user-list :list="list" @onClick="onClick" :isDelete="authOption.includes('storeDeleteUser')"
+                    @onDelete="onDelete" />
+            </My_listbox>
+        </view>
+        <view v-if="detail.status != '审核'" class="footer">
+            <view class="insert" style="flex:1;" :class="detail.status == '新建' ? '' : 'forbidden'"
+                @click="detail.status == '新建' ? toEdit() : ''">
+                编辑门店信息
             </view>
-        </block>
-        <view v-else style="height: 30px;" />
+            <view v-if="authOption.includes('storeComeUpForReview')" class="invite"
+                @click="detail.status == '新建' ? submit() : revocation()">
+                {{ detail.status == '新建' ? '提交门店信息' : '撤回' }}
+            </view>
+        </view>
     </view>
 </template>
 
 <script>
+import userList from "../../components/userList";
 export default {
+    components: { userList },
     data() {
         return {
             current: 0,
             sa_storeid: 0,
             detail: {},
             tabs: [{ name: "门店详情" }, { name: "门店人员" }],
-            showList: []
-
+            showList: [],
+            "content": {
+                "where": {
+                    "condition": ""
+                }
+            },
+            list: null,
+            searchShow: false,
+            authOption: [],
         }
     },
     onLoad(options) {
-        console.log(options)
         this.sa_storeid = options.id;
+        this.content.sa_storeid = options.id;
         this.getDetail();
         uni.setNavigationBarTitle({
             title: '门店信息'
         });
+        let auth = this.getApps('工作台', "/team/team/index");
+        if (auth) this.authOption = auth.option;
+    },
+    onShow() {
+        setTimeout(() => {
+            this.$refs.List.setHeight();
+        }, 300)
     },
     onUnload() {
         delete this.$Http.uploadStoreDetail;
+        delete this.$Http.uploadUserList;
     },
     methods: {
+        changeSearchShow() {
+            this.searchShow = !this.searchShow;
+            setTimeout(() => {
+                this.$refs.List.setHeight();
+            }, 300)
+        },
         getDetail() {
             this.$Http.basic({
                 "id": "20240410095402",
@@ -93,6 +139,19 @@ export default {
             }).then(res => {
                 console.log("店铺详情", res)
                 if (this.cutoff(res.msg)) return;
+
+                switch (res.data.status) {
+                    case '提交':
+                        res.data.color = '#009270'
+                        break;
+                    case '审核':
+                        res.data.color = '#095DE0'
+                        break;
+                    default:
+                        res.data.color = '#333333'
+                        break;
+                }
+
                 res.data.cover = res.data.attinfos.length ? this.getSpecifiedImage(res.data.attinfos[0], 'compressed') || uni.getStorageSync("site").logo : uni.getStorageSync("site").logo
                 this.detail = res.data;
                 this.showList = [{
@@ -140,6 +199,20 @@ export default {
                 url: "/store/insert/store?title=编辑门店信息&data=" + JSON.stringify(this.detail)
             })
         },
+        getList(init = false) {
+            if (this.paging(this.content, init)) return;
+            this.$Http.basic({
+                "id": "20240410150702",
+                content: this.content
+            }).then(res => {
+                this.$refs.List.RefreshToComplete()
+                console.log("获取门店人员列表", res)
+                this.$refs.List.setHeight();
+                if (this.cutoff(res.msg)) return;
+                this.list = res.pageNumber == 1 ? res.data : this.list.concat(res.data);
+                this.content = this.$refs.List.paging(this.content, res)
+            })
+        },
         submit() {
             let that = this;
             uni.showModal({
@@ -180,8 +253,70 @@ export default {
                 }
             });
         },
-        changeCurrent({ index }) {
+        changeCurrent({ index, name }) {
             this.current = index;
+            if (name == '门店人员') {
+                uni.pageScrollTo({
+                    scrollTop: 0,
+                    duration: 0,
+                });
+                if (this.list == null) {
+                    this.getList(true);
+                } else {
+                    setTimeout(() => {
+                        this.$refs.List.setHeight();
+                    }, 300)
+                }
+            }
+        },
+        onClick(item) {
+            uni.navigateTo({
+                url: '/team/userCenter/personal?id=' + item.sys_enterprise_hrid
+            });
+            this.onInsert();
+        },
+        onDelete(item) {
+            this.onInsert();
+            let that = this;
+            uni.showModal({
+                title: '提示',
+                content: `是否确定将“${item.name}”移除门店?`,
+                success: ({ confirm }) => {
+                    if (confirm) that.$Http.basic({
+                        "id": "20240410153602",
+                        "content": {
+                            "sa_store_hrids": [
+                                item.sa_store_hrid
+                            ]
+                        }
+                    }).then(res => {
+                        console.log("删除门店成员", res)
+                        if (that.cutoff(res.msg, `移除成员成功`)) return;
+                        that.$Http.uploadUserList();
+                    })
+                },
+            })
+
+        },
+        onInsert() {
+            this.$Http.uploadUserList = function () {
+                if (this.content.pageNumber && this.content.pageNumber >= 2) {
+                    let content = this.paging(this.content, true, true)
+                    this.$Http.basic({
+                        "id": "20240410150702",
+                        content
+                    }).then(res => {
+                        console.log("更新人员列表", res)
+                        if (this.cutoff(res.msg)) return;
+                        this.$refs.List.setHeight()
+                        this.list = res.data;
+                    })
+                }
+            }.bind(this)
+        },
+        onSearch(condition) {
+            this.content.where.condition = condition;
+            this.getList(true)
         }
     },
 
@@ -259,6 +394,44 @@ export default {
     }
 }
 
+.user-head {
+    height: 60px;
+    width: 100vw;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 10px;
+    box-sizing: border-box;
+
+    .title {
+        font-family: PingFang SC, PingFang SC;
+        font-weight: 500;
+        font-size: 16px;
+        color: #333333;
+    }
+
+    .funs {
+        display: flex;
+
+        .item {
+            width: 40px;
+            height: 40px;
+            text-align: center;
+            line-height: 40px;
+            background: #FFFFFF;
+            border-radius: 4px;
+            border: 1px solid #CCCCCC;
+            font-size: 18px;
+            color: #666666;
+            margin-left: 10px;
+        }
+    }
+}
+
+.My_search-box {
+    padding: 10px;
+    padding-top: 0px;
+}
 
 .footer {
     position: fixed;
@@ -299,6 +472,7 @@ export default {
         font-weight: 500;
         font-size: 16px;
         color: #FFFFFF;
+        margin-left: 10px;
     }
 
 

+ 83 - 0
store/insert/member.vue

@@ -0,0 +1,83 @@
+<template>
+    <My_listbox ref="List" @getlist="getList">
+        <view style="height: 10px;" />
+        <user-list :list="list" @onClick="onClick" />
+    </My_listbox>
+</template>
+
+<script>
+import userList from "../../components/userList"
+export default {
+    components: { userList },
+    data() {
+        return {
+            list: [],
+            "content": {
+                "sa_storeid": 0,
+                "pageNumber": 1,
+                "pageSize": 20
+            }
+        }
+    },
+    onLoad(options) {
+        uni.setNavigationBarTitle({
+            title: options.title || '添加门店成员',
+        });
+        this.content.sa_storeid = options.id;
+        this.getList(true);
+    },
+    onUnload() {
+        this.$Http.uploadUserList && this.$Http.uploadUserList()
+    },
+    methods: {
+        getList(init = false) {
+            if (this.paging(this.content, init)) return;
+            this.$Http.basic({
+                "id": "20240410142002",
+                content: this.content
+            }).then(res => {
+                this.$refs.List.RefreshToComplete()
+                console.log("获取可添加人员列表", res)
+                if (this.cutoff(res.msg)) return;
+                this.list = res.pageNumber == 1 ? res.data : this.list.concat(res.data);
+                this.content = this.$refs.List.paging(this.content, res)
+            })
+        },
+        onClick(item) {
+            let that = this;
+            uni.showModal({
+                title: "提示",
+                content: `是否确定添加“${item.name}”至门店人员中?`,
+                success: ({ confirm }) => {
+                    if (confirm) that.$Http.basic({
+                        "id": "20240410153502",
+                        "content": {
+                            "sa_storeid": that.content.sa_storeid,
+                            "sys_enterprise_hrids": [item.sys_enterprise_hrid]
+                        }
+                    }).then(res => {
+                        console.log("添加成员", res)
+                        if (that.cutoff(res.msg, '添加成功!')) return;
+                        that.onInsert()
+                    })
+                },
+            })
+        },
+        onInsert() {
+            if (this.content.pageNumber && this.content.pageNumber >= 2) {
+                let content = this.paging(this.content, true, true)
+                this.$Http.basic({
+                    "id": "20240410142002",
+                    content
+                }).then(res => {
+                    console.log("更新人员列表", res)
+                    if (this.cutoff(res.msg)) return;
+                    this.list = res.data;
+                })
+            }
+        },
+    },
+}
+</script>
+
+<style lang="scss"></style>

+ 1 - 0
store/insert/store.vue

@@ -169,6 +169,7 @@ export default {
         interrupt(item, selected, index) {
             switch (item.key) {
                 case "leader_hrid":
+                    console.log(selected)
                     item.showValue = [selected.name];
                     item.value = [selected.sys_enterprise_hrid];
                     this.$refs.form.setItem(index, item)

+ 1 - 1
store/orderForm/index.vue

@@ -23,7 +23,7 @@
         </view>
         <u-transition :show="searchShow">
             <view class="My_search-box">
-                <My_search :value="content.where.condition" @onSearch="onSearch">
+                <My_search :focus="searchShow" :value="content.where.condition" @onSearch="onSearch">
                     <view class="cancel" v-if="content.where.condition" hover-class="navigator-hover" @click="onSearch('')">
                         取消
                     </view>

+ 1 - 1
store/storeQRCode/index.vue

@@ -96,7 +96,7 @@ export default {
                                 showCancel: false
                             })
                             that.loading = false;
-                            this.$Http.basic({
+                            that.$Http.basic({
                                 "id": 20240319142702,
                                 "content": {
                                     sat_sharematerialid: that.detail.sat_sharematerialid, type: 1

+ 1 - 1
team/team/InviteUser.vue

@@ -100,7 +100,7 @@ export default {
                                 showCancel: false
                             })
                             that.loading = false;
-                            this.$Http.basic({
+                            that.$Http.basic({
                                 "id": 20240319142702,
                                 "content": {
                                     sat_sharematerialid: that.detail.sat_sharematerialid, type: 1

+ 6 - 5
team/team/index.vue

@@ -2,7 +2,7 @@
     <view>
         <u-tabs :scrollable="false" lineColor="#C30D23" :activeStyle="{ color: '#C30D23', fontWeight: 'bold' }" :list="tabs"
             @click="changeCurrent" />
-        <agency ref="经销商" v-show="pageNmae == '经销商'" />
+        <!-- <agency ref="经销商" v-show="pageNmae == '经销商'" /> -->
         <users ref="人员" v-show="pageNmae == '人员'" />
         <store ref="门店" v-show="pageNmae == '门店'" />
     </view>
@@ -16,14 +16,16 @@ export default {
     components: { users, store, agency },
     data() {
         return {
-            pageNmae: "经销商",
+            pageNmae: "人员",
             tabs: [{
-                name: '经销商',
-            }, {
                 name: '人员',
             }, {
                 name: '门店',
             }]
+
+            /* {
+                name: '经销商',
+            }, */
         }
     },
     onLoad() {
@@ -42,7 +44,6 @@ export default {
             this.changePage()
         },
         changePage() {
-            console.log(this.pageNmae)
             let page = this.$refs[this.pageNmae];
             if (page.uninitialized) page.init();
         }

+ 71 - 5
team/team/modules/store.vue

@@ -1,7 +1,12 @@
 <template>
-    <view class="">
+    <view>
         <view class="search-box">
-            <My_search background="#fff" @onSearch="onSearch" />
+            <My_search background="#fff" @onSearch="onSearch">
+                <view class="filtration-but" @click="openFiltrate">
+                    筛选
+                    <text class="iconfont icon-shaixuan" />
+                </view>
+            </My_search>
         </view>
         <view class="head">
             <text>
@@ -11,7 +16,7 @@
                 共{{ total }}个
             </text>
         </view>
-
+        <filtrate ref="Filtrate" :filtrateList="filtrateList" @onFiltration="onFiltration" />
         <My_listbox ref="List" @getlist="getList" bottomHeight="70">
             <store-list ref="storeList" :list="list" @onClick="onClick" />
         </My_listbox>
@@ -38,13 +43,59 @@ export default {
             },
             total: 0,
             list: [],
-            uninitialized: true
+            uninitialized: true,
+            filtrateList: []
         }
     },
     methods: {
         init() {
             this.getList(true)
         },
+        openFiltrate() {
+            if (this.filtrateList.length == 0) {
+                Promise.all(['storetype'].map(v => this.getCustomClass(v))).then(res => {
+                    let filtrateList = [{
+                        title: "状态",
+                        key: 'status',
+                        showKey: "remarks",
+                        selected: "value",
+                        value: "",
+                        defaultVal: "",
+                        rang: [{ remarks: "新建", value: "新建" }, { remarks: "提交", value: "提交" }, { remarks: "审核", value: "审核" },],
+                    }, {
+                        title: "门店类型",
+                        key: 'storetype',
+                        showKey: "remarks",
+                        selected: "value",
+                        value: "",
+                        defaultVal: "",
+                        rang: [{ remarks: "直营", value: "直营" }, { remarks: "分销", value: "分销" }],
+                    }, {
+                        title: "门店卖场类型",
+                        key: 'markettype',
+                        showKey: "remarks",
+                        selected: "value",
+                        value: "",
+                        defaultVal: "",
+                        rang: res[0],
+                    }]
+                    this.filtrateList = filtrateList.map(v => {
+                        v.rang.unshift({ remarks: "全部", value: "" })
+                        return v
+                    })
+                    this.$refs.Filtrate.changeShow();
+                })
+            } else {
+                this.$refs.Filtrate.changeShow();
+            }
+        },
+        onFiltration(where) {
+            this.content.where = {
+                condition: this.content.where.condition,
+                ...where
+            };
+            this.getList(true);
+        },
         getList(init = false) {
             if (this.paging(this.content, init)) return;
             this.$Http.basic({
@@ -58,7 +109,7 @@ export default {
                 this.$refs.List.setHeight()
                 res.data = this.$refs.storeList.handleList(res.data)
                 this.total = res.total;
-                this.list = res.pageNumber == 1 ? res.data : this.list.concat(res.data), this.colors;
+                this.list = res.pageNumber == 1 ? res.data : this.list.concat(res.data);
                 this.content = this.$refs.List.paging(this.content, res)
             })
         },
@@ -94,9 +145,24 @@ export default {
 
 <style lang="scss" scoped>
 .search-box {
+
     margin-top: 10px;
     padding: 0 10px;
     box-sizing: border-box;
+
+    .filtration-but {
+        display: flex;
+        align-items: center;
+        font-family: PingFang SC, PingFang SC;
+        font-size: 14px;
+        color: #333333;
+        padding-left: 10px;
+
+        text {
+            color: #DDDDDD !important;
+            margin-left: 5px;
+        }
+    }
 }
 
 .head {

+ 2 - 2
team/team/modules/storeList.vue

@@ -6,10 +6,10 @@
             <view class="content">
                 <view class="left">
                     <view class="tag-box">
-                        <view class="storetype">
+                        <view v-if="item.storetype" class="storetype">
                             {{ item.storetype }}
                         </view>
-                        <view class="markettype">
+                        <view v-if="item.markettype" class="markettype">
                             {{ item.markettype }}
                         </view>
                     </view>

+ 1 - 1
team/team/modules/users.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import userList from "../../team/modules/userList"
+import userList from "../../../components/userList";
 export default {
     components: { userList },
     data() {

+ 12 - 4
team/userCenter/insert.vue

@@ -25,7 +25,6 @@ export default {
         }
     },
     async onLoad(options) {
-        console.log(options)
         uni.setNavigationBarTitle({
             title: options.title || '新增人员'
         });
@@ -78,10 +77,8 @@ export default {
             value: [],
             showValue: [],
         }];
-
         if (options.data) {
             let data = JSON.parse(options.data);
-            console.log(data)
             this.sys_enterprise_hrid = data.sys_enterprise_hrid;
             form = form.map(v => {
                 switch (v.key) {
@@ -95,6 +92,16 @@ export default {
                 }
                 return v
             })
+            /*  if (data.iswechatbind) form.splice(6, 0, {
+                 key: "roleids",
+                 type: "route",
+                 path: "/select/roleid/roleid?sys_enterprise_hrid=" + data.sys_enterprise_hrid,
+                 isRadio: false,
+                 label: "角色",
+                 isMust: true,//是否必填
+                 value: data.roleids || [],
+                 showValue: data.rolenames ? data.rolenames.split(",") : [],
+             }) */
         }
         this.form = form;
     },
@@ -104,7 +111,7 @@ export default {
         },
         interrupt(item, selected, index) {
             switch (item.key) {
-                case "sa_storeids":
+                default:
                     item.showValue = selected.showValue || [];
                     item.value = selected.value || [];
                     this.$refs.form.setItem(index, item, true)
@@ -116,6 +123,7 @@ export default {
             let that = this;
             this.$refs.form.submit().then(data => {
                 data.sa_storeids = data.sa_storeids.value
+                if (data.roleids) data.roleids = data.roleids.value
                 this.$Http.basic({
                     "id": 20240410164102,
                     "content": {

+ 2 - 2
team/userCenter/personal.vue

@@ -10,7 +10,7 @@
         <view style="height: 70px;" />
         <view class="footer">
             <navigator class="insert" v-if="detail.iswechatbind == 0"
-                :url="'/team/userCenter/wechatbind?id=' + detail.userid + '&name=' + detail.name">
+                :url="'/team/userCenter/wechatbind?id=' + detail.sys_enterprise_hrid + '&name=' + detail.name">
                 绑定微信
             </navigator>
             <view class="invite" style="flex: 1;" @click="toEdit" hover-class="navigator-hover">
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import user from "../team/modules/userList.vue"
+import user from "../../components/userList.vue"
 export default {
     components: { user },
     data() {

+ 2 - 2
team/userCenter/selectUser.vue

@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import userList from "../team/modules/userList.vue"
+import userList from "../../components/userList.vue"
 export default {
     components: { userList },
     data() {
@@ -30,7 +30,7 @@ export default {
         getList(init = false) {
             if (this.paging(this.content, init)) return;
             this.$Http.basic({
-                "id": "20240410095602",
+                "id": "20240410142002",
                 content: this.content
             }).then(res => {
                 console.log("选择负责人", res)

+ 1 - 1
team/userCenter/wechatbind.vue

@@ -92,7 +92,7 @@ export default {
                                 showCancel: false
                             })
                             that.loading = false;
-                            this.$Http.basic({
+                            that.$Http.basic({
                                 "id": 20240319142702,
                                 "content": {
                                     sat_sharematerialid: that.detail.sat_sharematerialid, type: 1

Some files were not shown because too many files changed in this diff