fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by shuaiguo
Commit 24e6ef6c90896bba46f75e8360f44f0e3be66925 2 parents 7143ceba cee230cc

Merge remote-tracking branch 'origin/feature/ufo-icon' into develop

Inline Side-by-side
Showing 12 changed files with 33 additions and 13 deletions
@@ -28,7 +28,7 @@ const xianyu = { @@ -28,7 +28,7 @@ const xianyu = {
28 * @ description: 导航栏右侧自定义按钮 设为关闭 28 * @ description: 导航栏右侧自定义按钮 设为关闭
29 * @ author: huzhiming 29 * @ author: huzhiming
30 * @ date: 2019-11-14 16:15:07 30 * @ date: 2019-11-14 16:15:07
31 - * @ version: V1.0.5 31 + * @ version: v1.0.0
32 */ 32 */
33 closeNavRightItem() { 33 closeNavRightItem() {
34 34
@@ -41,7 +41,7 @@ const xianyu = { @@ -41,7 +41,7 @@ const xianyu = {
41 * @ description: 导航栏右侧自定义按钮 设为可见 41 * @ description: 导航栏右侧自定义按钮 设为可见
42 * @ author: huzhiming 42 * @ author: huzhiming
43 * @ date: 2019-11-05 11:54:24 43 * @ date: 2019-11-05 11:54:24
44 - * @ version: V1.0.5 44 + * @ version: v1.0.0
45 */ 45 */
46 setNavRightItem (shareParam = null, handler) { 46 setNavRightItem (shareParam = null, handler) {
47 window._xianyuShare = () => { 47 window._xianyuShare = () => {
@@ -64,7 +64,7 @@ const xianyu = { @@ -64,7 +64,7 @@ const xianyu = {
64 * @ description: 配置分享参数进行分享操作 64 * @ description: 配置分享参数进行分享操作
65 * @ author: huzhiming 65 * @ author: huzhiming
66 * @ date: 2019-11-05 10:38:24 66 * @ date: 2019-11-05 10:38:24
67 - * @ version: V1.0.5 67 + * @ version: v1.0.0
68 */ 68 */
69 setXianyuShare (param = { 69 setXianyuShare (param = {
70 shareType: 'activity', // 类型，默认activity 70 shareType: 'activity', // 类型，默认activity
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <div class="product-price"> 7 <div class="product-price">
8 <div class="red">¥{{data.goodPrice}}</div> 8 <div class="red">¥{{data.goodPrice}}</div>
9 <div class="product-name">{{data.productName}}</div> 9 <div class="product-name">{{data.productName}}</div>
10 - <div class="price">{{data.colorName}}，{{data.sizeName}}</div> 10 + <div class="price"><span class='icon-ufo'></span> {{data.colorName}}，{{data.sizeName}}</div>
11 </div> 11 </div>
12 </div> 12 </div>
13 <div v-if="!getLogin" class="no-login-tip">完成“有货”登录授权后将显示商品优惠及运费信息，请先完成登录查看最终支付金额</div> 13 <div v-if="!getLogin" class="no-login-tip">完成“有货”登录授权后将显示商品优惠及运费信息，请先完成登录查看最终支付金额</div>
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 </div> 5 </div>
6 <div class="product-price"> 6 <div class="product-price">
7 <div class="product-price-wrapper"> 7 <div class="product-price-wrapper">
8 - <div class="price">{{data.colorName}}，{{data.sizeName}}</div> 8 + <div class="price"><span class='icon-ufo'></span> {{data.colorName}}，{{data.sizeName}}</div>
9 <div class="tip">{{ data.priceType}} <span class="price2">{{data.goodPrice}}</span></div> 9 <div class="tip">{{ data.priceType}} <span class="price2">{{data.goodPrice}}</span></div>
10 <div v-if="data.priceBidType" class="tip">{{ data.priceBidType}} <span class="price2">{{data.goodBidPrice}}</span></div> 10 <div v-if="data.priceBidType" class="tip">{{ data.priceBidType}} <span class="price2">{{data.goodBidPrice}}</span></div>
11 </div> 11 </div>
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 </p> 23 </p>
24 </div> 24 </div>
25 <p class="item-spec"> 25 <p class="item-spec">
  26 + <span class='icon-ufo'></span>
26 <span>{{ goodsInfo.colorName }},</span> 27 <span>{{ goodsInfo.colorName }},</span>
27 <span>{{ goodsInfo.sizeName }}码</span> 28 <span>{{ goodsInfo.sizeName }}码</span>
28 </p> 29 </p>
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 {{ goodsInfo.productName }} 20 {{ goodsInfo.productName }}
21 </p> 21 </p>
22 <p class="item-spec"> 22 <p class="item-spec">
  23 + <span class="icon-ufo"></span>
23 <span v-for="(spec, i) in specList" :key="i"> 24 <span v-for="(spec, i) in specList" :key="i">
24 {{ spec }}{{ i !== specList.length - 1 ? "," : "" }} 25 {{ spec }}{{ i !== specList.length - 1 ? "," : "" }}
25 </span> 26 </span>
@@ -163,4 +164,4 @@ export default { @@ -163,4 +164,4 @@ export default {
163 } 164 }
164 } 165 }
165 } 166 }
166 -</style>  
  167 +</style>
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
27 </p> 27 </p>
28 </div> 28 </div>
29 <p class="item-spec"> 29 <p class="item-spec">
  30 + <span class='icon-ufo'></span>
30 <span>{{ goodsInfo.colorName }},</span> 31 <span>{{ goodsInfo.colorName }},</span>
31 <span>{{ goodsInfo.sizeName }}码</span> 32 <span>{{ goodsInfo.sizeName }}码</span>
32 </p> 33 </p>
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
22 <span> 22 <span>
23 {{ logisticInfo.expressCompanyName }} 23 {{ logisticInfo.expressCompanyName }}
24 </span> 24 </span>
  25 + <span class="icon-ufo"></span>
25 <!-- <span class="platform-info">{{ platformName }}</span> --> 26 <!-- <span class="platform-info">{{ platformName }}</span> -->
26 </p> 27 </p>
27 <p> 28 <p>
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
11 <div class="pro-info"> 11 <div class="pro-info">
12 <p class="pro-name">{{productInfo.productName}}</p> 12 <p class="pro-name">{{productInfo.productName}}</p>
13 <p class="stock-info"> 13 <p class="stock-info">
14 -<!-- <Logo :text="`有货UFO`" class="logo-wrapper"></Logo>-->  
15 - <p class="stock-text">{{productInfo.colorName}}, {{productInfo.sizeNum}}个尺码, {{productInfo.storageNum}}个商品库存<p> 14 + <!-- <Logo :text="`有货UFO`" class="logo-wrapper"></Logo> -->
  15 + <p class="stock-text"><span class="icon-ufo"></span> {{productInfo.colorName}}, {{productInfo.sizeNum}}个尺码, {{productInfo.storageNum}}个商品库存<p>
16 </p> 16 </p>
17 </div> 17 </div>
18 </div> 18 </div>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 ></ImgSize> 10 ></ImgSize>
11 <div class="pro-info"> 11 <div class="pro-info">
12 <p class="pro-name"> 12 <p class="pro-name">
13 - {{ goodsInfo.colorName }}, {{ goodsInfo.sizeName }}码 13 + <span class='icon-ufo'></span> {{ goodsInfo.colorName }}, {{ goodsInfo.sizeName }}码
14 </p> 14 </p>
15 <p class="stock-info ufo-font"> 15 <p class="stock-info ufo-font">
16 最低售价： ¥{{ goodsInfo.leastPrice || "-" }} 16 最低售价： ¥{{ goodsInfo.leastPrice || "-" }}
@@ -303,7 +303,7 @@ export default { @@ -303,7 +303,7 @@ export default {
303 * @ description: 配置打开闲鱼导航栏右上角分享按钮 && 配置分享信息 && 上报数据埋点 303 * @ description: 配置打开闲鱼导航栏右上角分享按钮 && 配置分享信息 && 上报数据埋点
304 * @ author: huzhiming 304 * @ author: huzhiming
305 * @ date: 2019-11-13 19:58:50 305 * @ date: 2019-11-13 19:58:50
306 - * @ version: V1.0.5 306 + * @ version: v1.0.0
307 */ 307 */
308 this.settingShareHandler(); 308 this.settingShareHandler();
309 }); 309 });
@@ -730,14 +730,14 @@ export default { @@ -730,14 +730,14 @@ export default {
730 * @ description: 配置打开闲鱼导航栏右上角分享按钮 && 配置分享信息 && 上报数据埋点 730 * @ description: 配置打开闲鱼导航栏右上角分享按钮 && 配置分享信息 && 上报数据埋点
731 * @ author: huzhiming 731 * @ author: huzhiming
732 * @ date: 2019-11-13 20:00:55 732 * @ date: 2019-11-13 20:00:55
733 - * @ version: V1.0.5 733 + * @ version: v1.0.0
734 */ 734 */
735 async settingShareHandler() { 735 async settingShareHandler() {
736 /* 736 /*
737 * @ description: [数据上报]@hooks: 分享链接进入pv，查看闲鱼淘口令，地址栏会附带shareUserId参数，目前淘口令查看事件未知，后期若知道淘口令打开事件可调整此数据埋点 737 * @ description: [数据上报]@hooks: 分享链接进入pv，查看闲鱼淘口令，地址栏会附带shareUserId参数，目前淘口令查看事件未知，后期若知道淘口令打开事件可调整此数据埋点
738 * @ author: huzhiming 738 * @ author: huzhiming
739 * @ date: 2019-11-13 20:36:00 739 * @ date: 2019-11-13 20:36:00
740 - * @ version: V1.0.5 740 + * @ version: v1.0.0
741 */ 741 */
742 if ( get(this.$route,'query.shareUserId','') !='' ) { 742 if ( get(this.$route,'query.shareUserId','') !='' ) {
743 this.$store.dispatch('reportYas', { 743 this.$store.dispatch('reportYas', {
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 * @author: huzhiming 4 * @author: huzhiming
5 * @date: 2019-11-04 18:02:07 5 * @date: 2019-11-04 18:02:07
6 * @后台人员: 6 * @后台人员:
7 - * @version: V1.0.5 7 + * @version: v1.0.0
8 * @path: 页面访问路径及参数说明 8 * @path: 页面访问路径及参数说明
9 !--> 9 !-->
10 <template> 10 <template>
@@ -703,3 +703,19 @@ img[lazy=loaded] { @@ -703,3 +703,19 @@ img[lazy=loaded] {
703 .aliapp-body .layout-header { 703 .aliapp-body .layout-header {
704 display: none; 704 display: none;
705 } 705 }
  706 +
  707 +/*
  708 + * @description: 添加ufo图标
  709 + * @author: huzhiming
  710 + * @date: 2019-11-15 15:36:58
  711 + * 调用示例： <span class='icon-ufo'></span>
  712 +*/
  713 +.icon-ufo {
  714 + width: 94px;
  715 + height: 28px;
  716 + margin-top: -4px;
  717 + vertical-align: middle;
  718 + display: inline-flex;
  719 + background: url(~statics/image/order/logo@3x.png) no-repeat;
  720 + background-size: cover;
  721 +}