xiaohaizhao 1 年間 前
コミット
3b7f1445b0

+ 1 - 0
cloud/designReality/index.vue

@@ -2,6 +2,7 @@
     <view>
          <u-tabs :scrollable="false" lineColor="#C30D23" :activeStyle="{ color: '#C30D23', fontWeight: 'bold' }"
             :list="tabs" @click="changeCurrent" :current="current" />
+		<view style="height: 10px;" />
         <My_listbox ref="List" @getlist="getList" bottomHeight="70">
             <designList ref="designList" :list="list" @toDetail="toDetail" showStatus />
         </My_listbox>

+ 18 - 19
pages/index/cloud/product.vue

@@ -99,26 +99,25 @@ export default {
             })
         },
         changeClass1(item) {
-            if (this.sa_fadclassid == item.sa_fadclassid) return;
-            this.sa_fadclassid = item.sa_fadclassid;
-            this.crumbs = [item, {
-                classname: '全部',
-                sa_fadclassid: item.sa_fadclassid
-            }];
-            if (item.children.length && item.children[0].classname != '全部') item.children.unshift({
-                classname: "全部",
-                sa_fadclassid: item.sa_fadclassid,
-                children: []
-            });
-            this.tabs2 = item.children;
-            this.tabs2Active = 0;
-            if (this.tabs2.length) setTimeout(() => {
-                this.$refs.tabs2.update()
-            }, 100)
-            this.tabs3 = [];
-            this.tabs3Active = 0;
-
             return new Promise((resolve, reject) => {
+                if (this.sa_fadclassid == item.sa_fadclassid) return resolve();
+                this.sa_fadclassid = item.sa_fadclassid;
+                this.crumbs = [item, {
+                    classname: '全部',
+                    sa_fadclassid: item.sa_fadclassid
+                }];
+                if (item.children.length && item.children[0].classname != '全部') item.children.unshift({
+                    classname: "全部",
+                    sa_fadclassid: item.sa_fadclassid,
+                    children: []
+                });
+                this.tabs2 = item.children;
+                this.tabs2Active = 0;
+                if (this.tabs2.length) setTimeout(() => {
+                    this.$refs.tabs2.update()
+                }, 100)
+                this.tabs3 = [];
+                this.tabs3Active = 0;
                 this.getList(true).then(res => resolve())
             });
         },

+ 80 - 59
pages/index/cloud/userInfo.vue

@@ -1,97 +1,107 @@
 <template>
-  <view class="work-panel_userinfo">
-      <view class="userinfo-left">
-          <view class="avatar">
+    <view class="work-panel_userinfo">
+        <view class="userinfo-left">
+            <view class="avatar">
                 <view class="image">
-                    <image :src="userInfoValue.headpic || 'https://yossys06593.obs.cn-east-3.myhuaweicloud.com:443/202404231713854678447B26b4363.svg'" mode="aspectFill"></image>
+                    <image
+                        :src="userInfoValue.headpic || 'https://yossys06593.obs.cn-east-3.myhuaweicloud.com:443/202404231713854678447B26b4363.svg'"
+                        mode="aspectFill"></image>
                 </view>
                 <text class="title">{{ userInfoValue.rolenames }}</text>
                 <text class="title2">{{ userInfoValue.rolenames }}</text>
-          </view>
-          <view class="info">
-              <text class="title">{{ userInfoValue.name || userInfoValue.remarks }}</text>
-              <text class="time">已加入{{ userInfoValue.joindays>30 ?`${Math.floor(userInfoValue.joindays/30)}个月`: `${userInfoValue.joindays}天` }}</text>
-          </view>
-      </view>
-      <view class="userinfo-right">
-          <navigator :url="isCode?'/cloud/businessCard/index':'/cloud/businessCard/edit?origin=my&id='+userInfoValue.userid" class="info-card" @click="goEdit">
-              <image class="image" src="/static/workbench/个人名片.svg" mode="widthFix" ></image>
-              <text class="title">{{isCode?'个人名片':'个人信息'}}</text>
-          </navigator>
-          <contact>
-            <view class="info-card">
-                <image class="image" src="/static/workbench/咨询消息.svg" mode="widthFix"></image>
-                <text class="title">咨询消息</text>
             </view>
-          </contact>
-          <navigator :url="'/store/storeQRCode/index?id='+userInfoValue.userid" class="info-card" v-if="isCode">
-              <image class="image" src="/static/workbench/店铺码.svg" mode="widthFix"></image>
-              <text class="title">店铺码</text>
-          </navigator>
-      </view>
-  </view>
+            <view class="info">
+                <text class="title">{{ userInfoValue.name || userInfoValue.remarks }}</text>
+                <text class="time">已加入{{ userInfoValue.joindays > 30 ? `${Math.floor(userInfoValue.joindays / 30)}个月` :
+                    `${userInfoValue.joindays}天` }}</text>
+            </view>
+        </view>
+        <view class="userinfo-right">
+            <navigator
+                :url="isCode ? '/cloud/businessCard/index' : '/cloud/businessCard/edit?origin=my&id=' + userInfoValue.userid"
+                class="info-card" @click="goEdit">
+                <image class="image" src="/static/workbench/个人名片.svg" mode="widthFix"></image>
+                <text class="title">{{ isCode ? '个人名片' : '个人信息' }}</text>
+            </navigator>
+            <contact>
+                <view class="info-card" hover-class="navigator-hover">
+                    <image class="image" src="/static/workbench/咨询消息.svg" mode="widthFix"></image>
+                    <text class="title">咨询消息</text>
+                </view>
+            </contact>
+            <navigator :url="'/store/storeQRCode/index?id=' + userInfoValue.userid" class="info-card" v-if="isCode">
+                <image class="image" src="/static/workbench/店铺码.svg" mode="widthFix"></image>
+                <text class="title">店铺码</text>
+            </navigator>
+        </view>
+    </view>
 </template>
 
 <script>
 import contact from "../../../components/contact"
-export default {    
-  components:{contact},
-  props:{
-    isCode: {
-      type:Boolean,
-      default:() => true
+export default {
+    components: { contact },
+    props: {
+        isCode: {
+            type: Boolean,
+            default: () => true
+        },
+        userInfoValue: {
+            type: Object,
+            default: () => { }
+        }
     },
-    userInfoValue: {
-        type:Object,
-        default:() => {}
-    }
-  },
-  data () {
-    return {
-    }
-  },
-  methods: {
-    goEdit () {
-        this.$Http.editUser = function (id){
-            this.$emit('upData',id)
-            delete this.$Http.editUser
-        }.bind(this)
-        this.$emit('selfCardClick')
+    data() {
+        return {
+        }
+    },
+    methods: {
+        goEdit() {
+            this.$Http.editUser = function (id) {
+                this.$emit('upData', id)
+                delete this.$Http.editUser
+            }.bind(this)
+            this.$emit('selfCardClick')
+        },
+        selfCardClick() {
+        }
     },
-    selfCardClick () {
-    }
-  },
 }
 </script>
 
 <style  lang="scss">
-  .work-panel_userinfo {
+.work-panel_userinfo {
     margin: 20px 0 30px 0;
     display: flex;
     align-items: center;
     justify-content: space-between;
+
     .userinfo-left {
         display: flex;
         align-items: center;
         justify-content: space-between;
+
         .avatar {
             display: flex;
             flex-direction: column;
             align-items: center;
             position: relative;
-            .image{
+
+            .image {
                 width: 44px;
                 height: 44px;
                 border: 2px solid #FFFFFF;
                 border-radius: 50%;
                 box-shadow: 0px 3px 6px 1px #E0D6D7;
+
                 image {
                     width: 100%;
                     height: 100%;
                     border-radius: 50%;
                 }
             }
-            .title{
+
+            .title {
                 font-family: PingFang SC, PingFang SC;
                 font-size: 10px;
                 padding: 3px 6px;
@@ -102,7 +112,8 @@ export default {
                 position: absolute;
                 bottom: -5px;
             }
-            .title2{
+
+            .title2 {
                 font-family: PingFang SC, PingFang SC;
                 font-size: 10px;
                 padding: 3px 6px;
@@ -111,42 +122,52 @@ export default {
                 opacity: 0;
             }
         }
+
         .info {
             display: flex;
             flex-direction: column;
             font-family: Source Han Sans SC, Source Han Sans SC;
             margin-left: 10px;
-            .title{
+
+            .title {
                 font-weight: 500;
                 font-size: 18px;
                 color: #333333;
             }
-            .time{
+
+            .time {
                 font-size: 12px;
                 color: #999999;
                 margin-top: 6px;
             }
         }
     }
+
     .userinfo-right {
         display: flex;
         align-items: center;
         font-family: Source Han Sans SC, Source Han Sans SC;
+
         .info-card {
             cursor: pointer;
             border-radius: 5px;
             box-sizing: border-box;
             padding: 5px;
-            &:nth-child(1),&:nth-child(2) {
+
+            &:nth-child(1),
+            &:nth-child(2) {
                 margin-right: 5px;
             }
+
             display: flex;
             flex-direction: column;
+
             .image {
                 width: 32px;
                 height: 32px;
                 align-self: center;
             }
+
             .title {
                 font-size: 10px;
                 color: #333333;
@@ -154,5 +175,5 @@ export default {
             }
         }
     }
-  }
+}
 </style>

+ 1 - 2
pages/index/index.vue

@@ -96,8 +96,7 @@ export default {
 			})
 			this.page = detail.name;
 			try {
-				console.log(this.$refs[detail.name].updatePage)
-				if (this.$refs[detail.name].updatePage) uni.pageScrollTo({
+				uni.pageScrollTo({
 					scrollTop: 0,
 					duration: 0,
 				})