Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

src/main/nine-space/src/router/index.js

@@ -421,14 +421,15 @@ router.beforeEach((to, from, next) => {
         window.open(url);
         return;
     }
+    console.log(to);
     if (!store.state.userInfo && to.meta.pageType !== Page.Login) {
         store
             .dispatch('getUserInfo')
             .then(() => {
-                next();
+                next(backNext(to));
             })
             .catch(() => {
-                if (to.meta.pageType != Page.Every) {
+                if (to.meta.pageType != Page.Every && to.path !== '/collectionDetail' && to.path !== '/castingDetail') {
                     Dialog.confirm({
                         title: '提示',
                         message: '用户未登录,是否立即登录'
@@ -440,14 +441,26 @@ router.beforeEach((to, from, next) => {
                             next(false);
                         });
                 } else {
-                    next();
+                    next(backNext(to));
                 }
             });
     } else {
-        next();
+        next(backNext(to));
     }
 });
 router.afterEach((to, from) => {
     jsapiSign();
 });
+
+function backNext(to) {
+    if (to.path === '/collectionDetail') {
+        to.path = '/productDetail';
+        return to;
+    } else if (to.path === '/castingDetail') {
+        to.path = '/creatorDetail';
+        return to;
+    } else {
+        return;
+    }
+}
 export default router;

src/main/nine-space/src/views/asset/GiveSearch.vue

@@ -12,8 +12,11 @@
                 autofocus
                 :left-icon="require('../../assets/svgs/icon-sosuo.svg')"
                 @search="getSearch"
-                @cancel="$router.go(-1)"
-            />
+            >
+                <template #action>
+                    <div @click="getSearch">搜索</div>
+                </template>
+            </van-search>
         </van-sticky>
         <van-list class="list" :immediate-check="false" :finished="finished" finished-text="" @load="getData">
             <div

src/main/nine-space/src/views/product/Detail.vue

@@ -44,8 +44,8 @@
             </div>
             <div class="title">{{ info.name }}</div>
             <div class="info-bottom">
-                <!-- <span class="text1" v-if="info.type !== 'DEFAULT'"> 编号 338392 </span>
-        <van-button
+                <span class="text1"> 编号 {{ info.id }} </span>
+                <!-- <van-button
           v-if="info.type !== 'DEFAULT'"
           type="primary"
           plain

src/main/pc-space/src/components/Share.vue

@@ -30,11 +30,11 @@ export default {
     computed: {
         shareConfig() {
             return {
-                url: resolveUrl(this.$baseUrl, this.pageType + '?id=' + this.info.id),
+                url: resolveUrl(this.$baseUrl, '9th/' + this.pageType + '?id=' + this.info.id),
                 title: this.shareTitle, // 标题，默认读取 document.title 或者 <meta name="title" content="share.js" />
                 description: this.description, // 描述, 默认读取head标签：<meta name="description" content="PHP弱类型的实现原理分析" />
                 image: this.image, // 图片, 默认取网页中第一个img标签
-                sites: ['qq', 'weibo', 'wechat', 'twitter'], // 启用的站点
+                sites: ['qq', 'wechat', 'weibo'], // 启用的站点
                 disabled: [], // 禁用的站点
                 wechatQrcodeTitle: '微信扫一扫',
                 wechatQrcodeHelper: '<p>微信里点“+”，扫一扫</p>'
@@ -43,21 +43,21 @@ export default {
         shareTitle() {
             return this.pageType == 'collectionDetail'
                 ? `收藏品——${this.info.name}`
-                : this.pageType === 'caseDetail'
+                : this.pageType === 'castingDetail'
                 ? `铸造者——${this.info.name}`
                 : `收藏品——${this.info.name}`;
         },
         description() {
             return this.pageType == 'collectionDetail'
                 ? `铸造者——${this.info.minter}`
-                : this.pageType === 'caseDetail'
+                : this.pageType === 'castingDetail'
                 ? this.info.intro
                 : `铸造者——${this.info.minter}`;
         },
         image() {
             return this.pageType == 'collectionDetail'
                 ? this.getImg(this.changeImgs(this.info.pic))
-                : this.pageType === 'caseDetail'
+                : this.pageType === 'castingDetail'
                 ? this.info.avatar
                 : this.getImg(this.changeImgs(this.info.pic));
         }

src/main/pc-space/src/router/index.js

@@ -253,24 +253,36 @@ router.beforeEach((to, from, next) => {
         store
             .dispatch('getUserInfo')
             .then(() => {
-                next();
+                next(backNext(to));
             })
             .catch(() => {
                 if (to.meta.checkLogin) {
                     MessageBox.confirm('用户未登录,是否立即登录', '提示', {
                         confirmButtonText: '立即登录'
                     }).then(() => {
-                        console.log(222);
                         eventBus.$emit('login');
                     });
                     next(false);
                 } else {
-                    next();
+                    next(backNext(to));
                 }
             });
     } else {
-        next();
+        next(backNext(to));
     }
 });
 
+
+
+function backNext(to) {
+    if (to.path === '/productDetail') {
+        to.path = '/collectionDetail';
+        return to;
+    } else if (to.path === '/creatorDetail') {
+        to.path = '/castingDetail';
+        return to;
+    } else {
+        return;
+    }
+}
 export default router;

src/main/pc-space/src/styles/app.less

@@ -216,3 +216,11 @@ body {
 .el-popper {
     border-width: 0;
 }
+
+.social-share {
+    width: 130px;
+}
+
+.share-popver{
+    min-width: 120px;
+}

src/main/pc-space/src/views/AssetDetail.vue

@@ -46,7 +46,7 @@
                 <div class="title">
                     <div class="title1">{{ info.name }}</div>
                     <div class="text">
-                        <el-popover placement="bottom" trigger="hover">
+                        <el-popover placement="bottom" popper-class="share-popver" trigger="hover">
                             <div class="text1" slot="reference">
                                 <img class="img1" src="../assets/img/fenxiang-icon@3x.png" alt="" />
                                 <div class="text2">分享</div>

src/main/pc-space/src/views/CastingDetail.vue

@@ -32,11 +32,11 @@
                     >
                         {{ info.follow ? '已关注' : '关注' }}
                     </el-button>
-                    <el-popover placement="bottom" trigger="hover">
+                    <el-popover popper-class="share-popver" placement="bottom" trigger="hover">
                         <el-button style="margin-left: 20px; color: #939599" slot="reference" plain round size="mini"
                             >分享</el-button
                         >
-                        <share :info="info" pageType="caseDetail"> </share>
+                        <share :info="info" pageType="castingDetail"> </share>
                     </el-popover>
                 </div>
 

src/main/pc-space/src/views/CollectionDetail.vue

@@ -35,7 +35,7 @@
                             {{ info.likes }}
                         </like-button>
 
-                        <el-popover placement="bottom" trigger="hover">
+                        <el-popover placement="bottom" popper-class="share-popver" trigger="hover">
                             <div class="text1" slot="reference">
                                 <img class="img1" src="../assets/img/fenxiang-icon@3x.png" alt="" />
                                 <div class="text2">分享</div>