Loki
/
zsw-farm-bxg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'sxx' into landong 

# Conflicts:
#	pages/shop/Evaluations/EvaluationDetail/index.vue
home_hotList
ld0104 2 years ago
parent
a3686c8389 14dfd485f4
commit
988425c175
7 changed files with 117 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      pages/activity/DargainGoodsDetails/index.vue
  2. 39
      pages/activity/GroupDetails/index.vue
  3. 41
      pages/activity/SeckillDetails/index.vue
  4. 5
      pages/expert/index.vue
  5. 2
      pages/shop/GoodSearch/index.vue
  6. 3
      pages/shop/GoodsList/index.vue
  7. BIN
      static/images/no-more.png

39
pages/activity/DargainGoodsDetails/index.vue
Unescape View File

@ -72,7 +72,11 @@
<view class="product-intro">
<view class="title">商品展示</view>
<view class="conter" v-html="goodsDetail.description"></view>
<view class="conter">
<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
:content="goodsDetail.description" @linktap="linktap" />
</view>
<!-- <view class="conter" v-html="goodsDetail.description"></view> -->
</view>
<view :style="addBottom?'height: 162rpx;':'height: 122rpx;'"></view>
@ -104,6 +108,14 @@
</view>
</view>
<!-- 词条弹框 -->
<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
<view class="entry-box">
<view class="entry">
{{entryInfo.entryInfo}}
</view>
</view>
</view>
</view>
</template>
@ -111,6 +123,7 @@
import ProductConSwiper from '@/components/ProductConSwiper';
import CountDown from '@/components/CountDown';
import { getBargainDetail } from '@/api/activity';
import { getEntry } from '@/api/store'
import { handleQrCode } from '@/utils/index'
export default {
components: {
@ -129,6 +142,12 @@
imgUrls: [],
styleAllStyle: 'width:30rpx;height:24rpx;background:#F5F6F8;border-radius:8rpx;font-size:20rpx;color:#3A3A3C;line-height:24rpx;',
timeTxtStyle: 'font-size:20rpx;color:#F5F6F8;line-height:24rpx;padding:0rpx 4rpx;',
entryInfo: {},
showEntry: false,
tagStyle: {
a: 'color:#0A59F7;text-decoration:underline;',
img: 'padding:0;margin:0;font-size:0;display:block;'
}
};
},
onLoad() {
@ -191,7 +210,23 @@
path: "/pages/activity/DargainDetails/index",
query: { id: this.bargainId, partake: 0 }
});
}
},
linktap(e) {
// console.log('description', e.innerText);
if (e.innerText == this.entryInfo.entryName) {
this.showEntry = true;
return;
}
getEntry({
name: e.innerText
}).then(res => {
this.entryInfo = res.data;
this.showEntry = true;
})
},
closeEntry() {
this.showEntry = false;
},
}
}
</script>

39
pages/activity/GroupDetails/index.vue
Unescape View File

@ -188,8 +188,11 @@
<!-- 产品介绍 -->
<view class="product-intro">
<view class="title">商品展示</view>
<view class="conter" v-html="storeInfo.description"></view>
<!-- <view class="conter" v-html=""></view> -->
<view class="conter">
<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
:content="storeInfo.description" @linktap="linktap" />
</view>
<!-- <view class="conter" v-html="storeInfo.description"></view> -->
</view>
<!-- 操作栏 -->
@ -257,6 +260,14 @@
</view>
</view>
<!-- 词条弹框 -->
<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
<view class="entry-box">
<view class="entry">
{{entryInfo.entryInfo}}
</view>
</view>
</view>
<!-- 商品信息弹窗 -->
<ProductWindow v-if="cartNum" v-on:changeFun="changeFun" :attr="attr" :cartNum="cartNum" :storeInfo="storeInfo.info" :unitName="storeInfo.unitName"></ProductWindow>
<StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus" :posterData="posterData"></StorePoster>
@ -272,7 +283,7 @@ import UserEvaluation from '@/components/UserEvaluation'
import ProductWindow from '@/components/ProductWindow'
import StorePoster from '@/components/StorePoster'
import { getCombinationDetail } from '@/api/activity'
import { postCartAdd } from '@/api/store'
import { postCartAdd, getEntry } from '@/api/store'
import { imageBase64 } from '@/api/public'
import { getCoupon, getCollectAdd, getCollectDel, getUserInfo } from '@/api/user'
const NAME = 'GroupDetails'
@ -330,6 +341,12 @@ export default {
},
cartNum: 1,
userCollect: false,
entryInfo: {},
showEntry: false,
tagStyle: {
a: 'color:#0A59F7;text-decoration:underline;',
img: 'padding:0;margin:0;font-size:0;display:block;'
}
}
},
computed: {},
@ -600,6 +617,22 @@ export default {
this.attr.cartAttr = true
this.isOpen = true
},
linktap(e) {
// console.log('description', e.innerText);
if (e.innerText == this.entryInfo.entryName) {
this.showEntry = true;
return;
}
getEntry({
name: e.innerText
}).then(res => {
this.entryInfo = res.data;
this.showEntry = true;
})
},
closeEntry() {
this.showEntry = false;
},
},
}
</script>

41
pages/activity/SeckillDetails/index.vue
Unescape View File

@ -118,7 +118,11 @@
<view class="product-intro">
<view class="title">商品展示</view>
<view class="conter" v-html="storeInfo.description"></view>
<view class="conter">
<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
:content="storeInfo.description" @linktap="linktap" />
</view>
<!-- <view class="conter" v-html="storeInfo.description"></view> -->
</view>
<!-- 操作栏 -->
@ -189,7 +193,16 @@
</view> -->
</view>
</view>
<!-- 词条弹框 -->
<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
<view class="entry-box">
<view class="entry">
{{entryInfo.entryInfo}}
</view>
</view>
</view>
<ProductWindow v-on:changeFun="changeFun" :attr="attr" :cartNum="cartNum" :storeInfo="storeInfo.info" :unitName="storeInfo.unitName"></ProductWindow>
<StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus" :posterData="posterData"></StorePoster>
</view>
@ -207,7 +220,7 @@ import ProductWindow from '@/components/ProductWindow'
import StorePoster from '@/components/StorePoster'
import UserEvaluation from '@/components/UserEvaluation';
import { getSeckillDetail } from '@/api/activity'
import { postCartAdd } from '@/api/store'
import { postCartAdd, getEntry } from '@/api/store'
import { imageBase64 } from '@/api/public'
import { getCoupon, getCollectAdd, getCollectDel, getUserInfo } from '@/api/user'
const NAME = 'SeckillDetails'
@ -254,6 +267,12 @@ export default {
userCollect: false,
styleAllStyle: 'width:30rpx;height:24rpx;background:#F5F6F8;border-radius:8rpx;font-size:20rpx;color:#3A3A3C;line-height:24rpx;',
timeTxtStyle: 'font-size:20rpx;color:#F5F6F8;line-height:24rpx;padding:0rpx 4rpx;',
entryInfo: {},
showEntry: false,
tagStyle: {
a: 'color:#0A59F7;text-decoration:underline;',
img: 'padding:0;margin:0;font-size:0;display:block;'
}
}
},
onShow: function() {
@ -526,6 +545,22 @@ export default {
})
}
},
linktap(e) {
// console.log('description', e.innerText);
if (e.innerText == this.entryInfo.entryName) {
this.showEntry = true;
return;
}
getEntry({
name: e.innerText
}).then(res => {
this.entryInfo = res.data;
this.showEntry = true;
})
},
closeEntry() {
this.showEntry = false;
},
},
}
</script>

5
pages/expert/index.vue
Unescape View File

@ -25,7 +25,7 @@
</view>
<view class="line"></view>
<view class="unit">{{item.expertUnit}}</view>
<view class="info">{{item.expertInfo}}</view>
<view class="info" :style="item.expertUnit?'':'height: 160rpx;'">{{item.expertInfo}}</view>
<view class="btn" :style="index%2?'':'margin-left: 192rpx;'" @click="contact">向ta留言咨询</view>
</view>
</view>
@ -109,6 +109,7 @@
// box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
}
.text-box {
padding-top: 10rpx;
width: 362rpx;
height: 304rpx;
@ -141,7 +142,7 @@
}
.info {
padding-left: 4rpx;
height: 126rpx;
height: 132rpx;
overflow: hidden;
font-family: PingFang SC;
line-height: 26rpx;

2
pages/shop/GoodSearch/index.vue
Unescape View File

@ -7,7 +7,7 @@
</block>
<block slot="content">
<view class="search acea-row row-between-wrapper" :style="'width:calc('+CustomBarLeft+'px - 57px);'">
<input type="text" placeholder="眼贴" placeholder-style="color: #999999;" v-model="search">
<input type="text" placeholder="眼贴" placeholder-style="color: #999999;" v-model="search" confirm-type="搜索" @confirm="submit">
<!-- <image src="../../../static/images/scan.png" /> -->
<view class="btn" @click="submit">搜索</view>
</view>

3
pages/shop/GoodsList/index.vue
Unescape View File

@ -350,7 +350,8 @@ export default {
}
.search {
input {
width: 376rpx;
width: 90%;
// width: 376rpx;
font-size: 26rpx;
font-family: PingFang SC;
font-weight: 500;

BIN
static/images/no-more.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Write Preview
Loading…
Cancel
Save