修改问题

src/components/basic-component/app-layout/app-layout.vue

@@ -315,7 +315,8 @@
                    currentRoute = this.$utils.deleteUrlParam(currentRoute, ['appid', 'appmsg_compact_url', 'wxwork_userid', 'weixinadinfo', 'gdt_vid'], true);
                }
 		console.log(currentRoute,"--------=========")
-		console.log(this.tabBarNavs,"---------=========")
+		console.log(this.tabBarNavs,"tabbar---------=========")
+		console.log(currentRoute,"--------=========")
                for (let i = 0; i < this.tabBarNavs.length; i++) {
                    if (currentRoute == this.tabBarNavs[i].url) {
                        return this.tabbarbool = true;

src/components/page-component/app-special-topic/app-special-topic-list.vue

@@ -90,6 +90,8 @@
 					</view>
 					<view class="w-read">{{ item.read_number }} 阅读</view>
 				</view>
+				
+				<app-no-goods v-if="list.length === 0" :title="'没有任何专题哦'" background="#f7f7f7"></app-no-goods>
 			</view>
 		</view>
 		<pre-topic :previewItem="previewItem" :swiperCurrent="swiperCurrent" :previewStatus.sync="previewStatus">
@@ -101,6 +103,7 @@
 		mapGetters
 	} from 'vuex';
 	import preTopic from './pre-topic.vue';
+	import appNoGoods from '@/components/page-component/app-no-goods/app-no-goods.vue';
 	export default {
 		props: {
 			catShow: {
@@ -140,6 +143,7 @@
 		},
 		components: {
 			preTopic,
+			appNoGoods
 		},
 
 		computed: {

src/components/page-component/goods/app-goods-banner.vue

@@ -201,7 +201,7 @@
         top: #{250rpx};
     }
     .bd-cart-1 {
-        top: #{60rpx};
+        top: #{180rpx};
     }
     .share-commission {
         height: #{80rpx};

src/pages.json

@@ -292,7 +292,7 @@
 			"pages": [{
 					"path": "index/index",
 					"style": {
-						"navigationBarTitleText": ""
+						"navigationBarTitleText": "我的足迹"
 					}
 				},
 				{

src/pages/case/components/hxj-bd-info.vue

@@ -0,0 +1,295 @@
+<template>
+    <view class="bd-info">
+		<view class="main-between hxj-goods-name">
+			<view class="main-between-y">
+				<view class="main-left cross-center">
+					<view class="hxj-name t-omit">{{name}}</view>
+					<view class="hxj-tags">套装</view>
+					<view class="hxj-ynum">已售{{sales}}+</view>
+				</view>
+				<view class="main-left cross-center hjx-tc-999 hjx-ts-22">
+					<view style="margin-right: 31rpx;">A1 200m²</view>
+					<view class="hjx-text-decoration-line-through">{{originalPrice}}元</view>
+				</view>
+				<view class="hjx-tc-AE8445 hjx-ts-22 hjx-tw-500" style="margin:26rpx 0 22rpx ;">券后价</view>
+				<view class="hxj-price"><text class="rmb">￥</text>{{price}}<text class="dw">元</text></view>
+			</view>
+			<view class="main-between-y">
+				<view class="lq" @click="receive">领券</view>
+				<view class="cross-center se" v-if="isShowShare" @click="shareClick">
+					<image src="../../../static/image/index/share_y.png" mode=""></image>分享
+				</view>
+			</view>
+		</view>
+
+            <template v-if="!isShowShare && $slots.share">
+                <view class="bd-share">
+                    <slot name="share"></slot>
+                </view>
+            </template>
+            <template v-if="isShowShare">
+                <bd-quick-share
+                    v-model="quickShareShow"
+                    @quickShare="quickShare"
+                    :goods-id="goodsId"
+                    :is-video-number="goods.is_video_number"
+                    :extra-quick-share="extraQuickShare"
+                    :app-share-pic="appSharePic"
+                    :app-share-title="appShareTitle"
+                ></bd-quick-share>
+                <app-share-qr-code
+                    @share="testShare"
+                    v-model="shareShow"
+                    :url="newShareUrl"
+                    :goods="goods"
+                    :poster-config="posterConfig"
+                    :poster-generate="posterGenerate"
+                    :has-poster-nav="hasPosterNav"
+                    :app-share-pic="appSharePic"
+                    :app-share-title="appShareTitle"
+                ></app-share-qr-code>
+            </template>
+        </view>
+    </view>
+</template>
+
+<script>
+import {mapState} from "vuex";
+import bdQuickShare from '@/components/page-component/goods/bd-quick-share.vue';
+import appShareQrCode from '@/components/page-component/app-share-qr-code-poster/app-share-qr-code-poster.vue';
+
+export default {
+    name: "u-info",
+    props: {
+        name: String,
+        subtitle: String,
+        isNegotiable: Number,
+        theme: Object,
+        flashSale: Object,
+        levelShow: Number,
+		price: {
+			type: [Number, String]
+		},
+		originalPrice: {
+			type: [Number, String]
+		},
+		priceMax: Number,
+		priceMin: Number,
+		priceMemberMax: Number,
+		priceMemberMin: Number,
+		isShowMember: {
+			type: Boolean,
+			default() {
+				return true;
+			}
+		},
+		discount: {
+			type: [Number, String]
+		},
+		isVipCardUser: {
+			type: Number,
+			default() {
+				return 0;
+			}
+		},
+		sales: {
+			type: [Number, String]
+		},
+		unit: String,
+		isSales: Number,
+		goodsId: Number,
+		goods: Object,
+		isVip: Boolean,
+		isShowShare: {
+			type: Boolean,
+			default() {
+				return true;
+			}
+		},
+		isProcess: {
+			type: Boolean,
+			default() {
+				return false;
+			}
+		},
+		posterConfig: String,
+		posterGenerate: String,
+		hasPosterNav: {
+			type: Boolean,
+			default() {
+				return false
+			},
+		},
+		shareUrl: String,
+		appShareTitle: String,
+		appSharePic: String,
+		extraQuickShare: Object,
+		minNumber: Number,
+		limitBuy: Object,
+		hasUnderlinePrice: {
+			type: [Boolean, String],
+			default:true
+		}
+    },
+        data() {
+            return {
+                shareShow: false,
+                quickShareShow: false
+            }
+        },
+        components: {
+            bdQuickShare,
+            appShareQrCode,
+        },
+        computed: {
+            isUnderlinePrice() {
+                return Number(this.is_underline_price) && this.hasUnderlinePrice
+            },
+            ...mapState({
+                is_underline_price: state => state.mallConfig.mall.setting.is_underline_price
+            }),
+            newShareUrl() {
+                if (this.shareUrl) {
+                    return this.shareUrl;
+                } else {
+                    if (this.goodsId) {
+                        return this.$api.poster.goods + '&goods_id=' + this.goodsId;
+                    } else {
+                        return ``;
+                    }
+                }
+            }
+        },
+        methods: {
+            testShare(s){
+                this.$emit('share', s);
+            },
+            quickShare(e) {
+                this.$emit('quickShare', e);
+            },
+            shareClick() {
+                // 判断登入
+                if (!this.$user.isLogin()) {
+                    this.$user.getInfo().then(() => {
+                    });
+                } else {
+                    if (this.extraQuickShare) {
+                        this.quickShareShow = true;
+                    } else {
+                        this.shareShow = true;
+                    }
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+	.hxj-goods-name{
+		width: 750rpx;
+		height: auto;
+		background: #F6F6F6;
+		padding: 43rpx 30rpx 28rpx 46rpx;
+		.hxj-name{
+			width: 360rpx;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #121212;
+			line-height: 56rpx;
+			margin-right: 14rpx;
+		}
+		.hxj-tags{
+			width: 56rpx;
+			height: 30rpx;
+			background: #040404;
+			font-size: 20rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			margin-right: 13rpx;
+			text-align: center;
+		}
+		.hxj-ynum{
+			width: auto;
+			height: 30rpx;
+			border: 1rpx solid #AE8445;
+			border-radius: 4rpx;
+			font-size: 22rpx;
+			font-weight: 500;
+			color: #AE8445;
+			opacity: 0.6;
+			padding: 0 6rpx;
+			line-height: 30rpx;
+			text-align: center;
+		}
+		.hxj-price{
+			font-size: 46rpx;
+			font-weight: bold;
+			color: #A6814F;
+			.rmb{
+				font-size: 18rpx;
+				font-weight: 500;
+				color: #A6814F;
+				margin-right: 9rpx;
+			}
+			.dw{
+				font-size: 20rpx;
+				font-weight: 500;
+				color: #A6814F;
+				margin-left: 13rpx;
+			}
+		}
+		.lq{
+			width: 92rpx;
+			height: 38rpx;
+			background: #FF0000;
+			border-radius: 19rpx;
+			font-size: 20rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			text-align: center;
+			line-height: 38rpx;
+			margin-top: 10rpx;
+		}
+		.se{
+			image{
+				width: 25rpx;
+				height: 25rpx;
+				margin-right: 6rpx;
+			}
+			font-size: 24rpx;
+			font-weight: 500;
+			color: #AE8445;
+		}
+	}
+
+
+    .bd-share {
+        margin-top: 15upx;
+        margin-right: -20upx;
+    }
+
+    .bd-share .bd-share-box {
+        height: 48upx;
+        border-radius: 40upx 0 0 40upx;
+        padding: 0 14upx;
+        width: 103upx;
+    }
+
+    .bd-share .bd-icon {
+        width: 22upx;
+        height: 22upx;
+    }
+    .bd-share .bd-text {
+        color: #ffffff;
+        font-size: 22upx;
+        line-height: 30upx;
+        margin-left: 10upx;
+    }
+	.process{
+		background-color: rgb(221, 183, 102);
+		    background-size: 100% 100%;
+		    width: 20.66rem;
+		    height: 2.78rem;
+	}
+
+</style>

src/pages/case/hot_sale_project.vue

@@ -62,7 +62,7 @@
 			},
 			goPage(){
 				uni.navigateTo({
-					url:'/pages/case/projectInfo?id=10'
+					url:'/pages/case/projectInfo?id=9'
 				})
 			}
 		}

src/pages/case/projectInfo.vue

@@ -1,25 +1,25 @@
 <template>
     <app-layout>
-		<app-nav-bar v-if="true"
-		             :fixed="true"
-		             :background-color="''"
-		             :xStyle="1"
-		             :hasMallSetting="2"
-					 :hasHeight="false"
-					 @headHeight="headHeight"
-		></app-nav-bar>
         <view v-if="!goods" class="u-goods-detail"></view>
         <template v-if="goods">
+			<app-nav-bar v-if="true"
+			             :fixed="true"
+			             :background-color="''"
+			             :xStyle="1"
+			             :hasMallSetting="2"
+						 :hasHeight="false"
+			></app-nav-bar>
+			
             <!--商品轮播图-->
             <app-goods-banner
                 v-bind:pic-list="goods.pic_url"
                 v-bind:share="goods.share"
                 v-bind:video-url="goods.video_url"
                 v-bind:goods_id="goodsId"
-				:isCart="false"
+				:isCart="true"
             ></app-goods-banner>
 			<!-- 套装内商品 -->
-            <view>
+            <view style="background-color: #fff;">
 				<view class="link ">
 					<view class="title1 main-left cross-center">套装内商品<image class="coupon_1"
 							src="https://t17.9026.com/web/statics/image/index/coupon_1.png" mode=""></image><text
@@ -27,41 +27,55 @@
 				
 				</view>
 				<hxj-scroll-list :itemWidth="'168rpx'" :itemHeight="'168rpx'" :list="list"></hxj-scroll-list>
-				<view class="main-between hxj-goods-name">
-					<view class="main-between-y">
-						<view class="main-left cross-center">
-							<view class="hxj-name">兴城人居ins风套装</view>
-							<view class="hxj-tags">套装</view>
-							<view class="hxj-ynum">已售3000+</view>
-						</view>
-						<view class="main-left cross-center hjx-tc-999 hjx-ts-22">
-							<view style="margin-right: 31rpx;">A1 200m²</view>
-							<view class="hjx-text-decoration-line-through">2600.00元</view>
-						</view>
-						<view class="hjx-tc-AE8445 hjx-ts-22 hjx-tw-500">券后价</view>
-						<view class="hxj-price"><text class="rmb">￥</text>2000.00<text class="dw">元</text></view>
-					</view>
-					<view class="main-between-y">
-						<view class="lq" @click="isCouponShow=!isCouponShow">领券</view>
-						<view class="se">
-							<image src="https://t17.9026.com/web/statics/image/index/share.png" mode=""></image>分享
-						</view>
-					</view>
-				</view>
-				<view class="hxj-goods-list">
+				<hxj-bd-info
+				    :theme="getTheme"
+				    :name="name"
+				    :is-negotiable="is_negotiable"
+				    :subtitle="subtitle"
+				    :flash-sale="flash_sale"
+				    :level-show="level_show"
+				    :price="price"
+				    :original-price="original_price"
+				    :price-max="price_max"
+				    :price-min="price_min"
+				    :price-member-max="price_member_max"
+				    :price-member-min="price_member_min"
+				    :discount='discount'
+				    :is-vip-card-user="is_vip_card_user"
+				    :sales="sales"
+				    :is-vip="is_vip"
+				    :unit="unit"
+				    :is-sales="is_sales"
+				    :goods-id="goodsId"
+				    :extra-quick-share="extra_quick_share"
+				    :app-share-pic="app_share_pic ? app_share_pic: goods.pic_url[0].pic_url"
+				    :app-share-title="app_share_title ? app_share_title : name"
+				    :poster-config="poster_config + `&goods_id=` + goodsId"
+				    :poster-generate="poster_generate + `&goods_id=` + goodsId"
+				    :has-poster-nav="true"
+				    v-bind:goods="goods"
+				    @share="hShareAppMessage"
+				    @quickShare="quickShare"
+					:limit-buy="limit_buy"
+					:min-number="min_number"
+				></hxj-bd-info>
+				<view class="hxj-goods-list" :style="{'height':isOpen?'auto':'270rpx'}">
 					<view class="main-between" style="width: 560rpx;">
 						<view class="title">套装内商品</view>
 						<view class="title">数量</view>
 					</view>
-					<view class="main-between item" >
+					<view class="main-between item" v-for="(item,index) in 5" :key="index">
 						<view class="main-between" style="width: 560rpx;">
 							<view class="name t-omit">ins风高档皮质沙发</view>
 							<view class="num">x1</view>
 						</view>
-						<view class="zk cropss-center">展开<image src="https://t17.9026.com/web/statics/image/user-center/arrow-bottom.png" mode=""></image></view>
+						<view class="zk cropss-center" v-if="index===1 && isOpen===false" @click="isOpen=true">展开<image src="https://t17.9026.com/web/statics/image/user-center/arrow-bottom.png" mode=""></image></view>
+						<view class="zk cropss-center" v-if="index===4 && isOpen===true" @click="isOpen=false">收起<image src="https://t17.9026.com/web/statics/image/user-center/arrow-top.png" mode=""></image></view>
 					</view>
 				</view>
 			</view>
+			
+			
             <!--商品优惠券-->
             <bd-coupon @change="setCoupon" @on-show-change="(val)=>{isCouponShow=val}" :isCustomEntry="true" :myShow="isCouponShow" :theme="getTheme" :coupons="goods_coupon_center"></bd-coupon>
             <!--商品规格-->
@@ -247,7 +261,8 @@
 	import goodsMixin from '@/core/goods-mixin.js';
 	import appNavBar from '@/components/page-component/index/app-nav-bar.vue';
 	
-	import hxjScrollList from'./components/scroll-list.vue'
+	import hxjScrollList from'./components/scroll-list.vue';
+	import hxjBdInfo from'./components/hxj-bd-info.vue';
     export default {
         name: "goods",
 		mixins: [goodsMixin],
@@ -271,7 +286,8 @@
             bdFlashSale,
 			appSellTip,
 			appNavBar,
-			hxjScrollList
+			hxjScrollList,
+			hxjBdInfo
         },
         data() {
             return {
@@ -297,6 +313,7 @@
 						tag: ''
 					}
 				],
+				isOpen:false, //hxj套装内商品是否展开
 				
 				
 				
@@ -772,82 +789,13 @@
 
 <style scoped lang="scss">
 	@import '../index/index.scss';
-	.hxj-goods-name{
-		width: 750rpx;
-		height: 261rpx;
-		background: #F6F6F6;
-		padding: 63rpx 30rpx 28rpx 46rpx;
-		.hxj-name{
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #121212;
-			line-height: 56rpx;
-			margin-right: 14rpx;
-		}
-		.hxj-tags{
-			width: 56rpx;
-			height: 30rpx;
-			background: #040404;
-			font-size: 20rpx;
-			font-weight: 400;
-			color: #FFFFFF;
-			margin-right: 13rpx;
-			text-align: center;
-		}
-		.hxj-ynum{
-			width: 126rpx;
-			height: 30rpx;
-			border: 1rpx solid #AE8445;
-			border-radius: 4rpx;
-			font-size: 22rpx;
-			font-weight: 500;
-			color: #AE8445;
-			opacity: 0.6;
-			text-align: center;
-		}
-		.hxj-price{
-			font-size: 46rpx;
-			font-weight: bold;
-			color: #A6814F;
-			.rmb{
-				font-size: 18rpx;
-				font-weight: 500;
-				color: #A6814F;
-				margin-right: 9rpx;
-			}
-			.dw{
-				font-size: 20rpx;
-				font-weight: 500;
-				color: #A6814F;
-				margin-left: 13rpx;
-			}
-		}
-		.lq{
-			width: 92rpx;
-			height: 38rpx;
-			background: #FF0000;
-			border-radius: 19rpx;
-			font-size: 20rpx;
-			font-weight: 500;
-			color: #FFFFFF;
-			text-align: center;
-			line-height: 38rpx;
-		}
-		.se{
-			image{
-				width: 25rpx;
-				height: 25rpx;
-				margin-right: 6rpx;
-			}
-			font-size: 24rpx;
-			font-weight: 500;
-			color: #AE8445;
-		}
-	}
+
     .hxj-goods-list{
 		width: 100%;
 		height: 270rpx;
+		overflow: hidden;
 		padding: 50rpx 43rpx 50rpx 51rpx;
+		background-color: #fff;
 		.title{
 			font-size: 24rpx;
 			font-weight: 500;
@@ -969,7 +917,7 @@
         text-align: center;
         line-height: 70upx;
         font-size: 28upx;
-        border-radius: 35upx;
+        // border-radius: 35upx;
     }
     .bd-btn-left {
         border-top-right-radius: 0;

src/pages/coupon/list/list.vue

@@ -45,13 +45,14 @@
                     </view>
                 </view>
             </view>
+			<app-no-goods v-if="list.length === 0" :title="'暂无可领取优惠券'" background="#f7f7f7"></app-no-goods>
         </view>
     </app-layout>
 </template>
 
 <script>
 import {mapGetters, mapState} from "vuex";
-
+import appNoGoods from '@/components/page-component/app-no-goods/app-no-goods.vue';
     export default {
         data() {
             return {
@@ -60,6 +61,9 @@ import {mapGetters, mapState} from "vuex";
                 page: 2,
             }
         },
+		components:{
+			appNoGoods
+		},
         computed: {
             ...mapState({
                 couponImg: state => state.mallConfig.__wxapp_img.coupon,
@@ -274,4 +278,5 @@ import {mapGetters, mapState} from "vuex";
         font-size: $uni-font-size-general-one;
         line-height: 1.1;
     }
+	
 </style>

src/pages/favorite/favorite.vue

@@ -233,8 +233,8 @@
 
 
 			<view class="f-topic" v-if="getCurrent === 1" :class="getCurrent === 1 ? 'f-good-show' : 'f-good-hidden'">
-			                <app-special-topic-list :cat-show="false" :topic-list="topicList"></app-special-topic-list>
-			            </view>
+			        <app-special-topic-list :cat-show="false" :topic-list="topicList"></app-special-topic-list>
+			</view>
 		</view>
 	</app-layout>
 </template>

src/pages/foot/index/index.vue

@@ -1,16 +1,16 @@
 <template>
     <app-layout>
         <view class="tab-list">
-            <view class="tab cross-center main-center">
+            <!-- <view class="tab cross-center main-center">
                 <view class="active">浏览记录</view>
                 <view @click="redirect('/pages/foot/summary/summary')">账单总结</view>
-            </view>
+            </view> -->
             <view class="tab-date dir-left-nowrap">
-                <view @click="chooseDate(today,today)" :class="[`${start_time == today && today !='' ? 'active' : ''}`]">今日</view>
-                <view @click="chooseDate(yesterday,yesterday)" :class="[`${start_time == yesterday && yesterday !='' ? 'active' : ''}`]">昨日</view>
-                <view @click="chooseDate(weekday,today)" :class="[`${start_time == weekday && weekday !='' ? 'active' : ''}`]">近7日</view>
-                <view @click="chooseDate(monthday,today)" :class="[`${start_time == monthday && monthday !='' ? 'active' : ''}`]">近30日</view>
-                <view @click="choose" :class="[`${otherday ? 'active customize' : 'customize'}`]">{{otherday && showTime ? showTime : '自定义时间'}}</view>
+                <view @click="chooseDate(today,today)" :style="{'background':start_time == today && today !='' ? getTheme.background_gradient_btn:'','color': start_time == today && today !='' ?getTheme.main_text:''}" >今日</view>
+                <view @click="chooseDate(yesterday,yesterday)" :style="{'background':start_time == yesterday && yesterday !='' ? getTheme.background_gradient_btn:'','color': start_time == yesterday && yesterday !='' ?getTheme.main_text:''}" >昨日</view>
+                <view @click="chooseDate(weekday,today)" :style="{'background':start_time == weekday && weekday !='' ? getTheme.background_gradient_btn:'','color': start_time == weekday && weekday !='' ?getTheme.main_text:''}">近7日</view>
+                <view @click="chooseDate(monthday,today)" :style="{'background':start_time == monthday && monthday !='' ? getTheme.background_gradient_btn:'','color': start_time == monthday && monthday !='' ?getTheme.main_text:''}">近30日</view>
+                <view @click="choose" :style="{'background':otherday ? getTheme.background_gradient_btn:'','color': otherday ?getTheme.main_text:''}" class="[customize">{{otherday && showTime ? showTime : '自定义时间'}}</view>
             </view>
         </view>
         <view class="tab-placeholder"></view>
@@ -39,7 +39,7 @@
         <view class="no-list main-center cross-center dir-top-nowrap" v-else>
             <image src="https://shop.9026.com/web/statics/img/mall/foot/foot.png"></image>
             <view>暂无浏览的足迹哦~</view>
-            <view @click="redirect('/pages/index/index')" class="to-mall">去商城逛逛</view>
+            <view @click="redirect('/pages/index/index')" class="to-mall" :style="{'background':getTheme.background_gradient_btn,'color':getTheme.main_text}">去商城逛逛</view>
         </view>
         <view :catchtouchmove="!showMenu" v-if="showMenu" class="dialog">
             <view class="other-area" @click="closeMenu"></view>
@@ -160,7 +160,7 @@
                 <view class="main-center btn-area">
                     <view class="submit-btn" @click='cancel'>取消</view>
                     <view class="line"></view>
-                    <view class="submit-btn be-submit" @click='toChoose'>确认</view>
+                    <view class="submit-btn" :style="{color: getTheme.color}" @click='toChoose'>确认</view>
                 </view>
             </view>
         </view>
@@ -605,8 +605,8 @@
             line-height: #{80rpx};
             text-align: center;
             border-radius: #{40rpx};
-            background-color: #FF4544;
-            color: #fff;
+            // background-color: #FF4544;
+            // color: #fff;
             margin-top: #{40rpx};
         }
     }
@@ -939,7 +939,7 @@
                 margin: 0 auto #{25rpx};
                 text-align: center;
                 .sure-color {
-                    color: #ff4544;
+                    color: #000000;
                 }
                 .cardinal-color {
                     color: #999999;

src/pages/goods/goods.vue

@@ -2,6 +2,10 @@
     <app-layout>
         <view v-if="!goods" class="u-goods-detail"></view>
         <template v-if="goods">
+			
+			<app-nav-bar  :fixed="true" :background-color="''" :xStyle="1" :hasMallSetting="2"
+				:hasHeight="false"></app-nav-bar>
+			
             <!--商品轮播图-->
             <app-goods-banner
                 v-bind:pic-list="goods.pic_url"
@@ -226,6 +230,8 @@
     import bdFlashSale from '@/components/page-component/goods/bd-flash-sale.vue';
     import appSellTip from '@/components/page-component/goods/app-sell-tip.vue';
 	import goodsMixin from '@/core/goods-mixin.js';
+	
+	import appNavBar from '@/components/page-component/index/app-nav-bar.vue';
 
     export default {
         name: "goods",
@@ -248,7 +254,8 @@
             bdComments,
             bdService,
             bdFlashSale,
-			appSellTip
+			appSellTip,
+			appNavBar
         },
         data() {
             return {
@@ -806,7 +813,7 @@
         text-align: center;
         line-height: 70upx;
         font-size: 28upx;
-        border-radius: 35upx;
+        // border-radius: 35upx;
     }
     .bd-btn-left {
         border-top-right-radius: 0;

src/pages/share/cash/cash.vue

@@ -9,7 +9,7 @@
                 </view>
                 <view v-else>今日{{custom_setting.words.cash_money.name}}无限制</view>
                 <view @click="visible = !visible">
-                    <button class="show-tip">规则</button>
+                    <button class="show-tip" :style="{color:getTheme.color,border: `1rpx solid ${getTheme.color}` }">规则</button>
                 </view>
             </view>
         </view>
@@ -58,8 +58,8 @@
                            type="number" placeholder="请输入正确的银行卡帐号"/>
                 </view>
             </view>
-            <view class="submit">
-                <button @click="subscribe" >提交申请</button>
+            <view class="submit" >
+                <button :style="{'background': getTheme.background_gradient_btn,'color':getTheme.main_text}" @click="subscribe" >提交申请</button>
             </view>
         </view>
         <app-cash-model
@@ -88,7 +88,7 @@
 </template>
 
 <script>
-    import {mapState} from "vuex";
+    import {mapState,mapGetters} from "vuex";
     import appCashModel from "../../../components/page-component/app-cash-model/app-cash-model";
 
     export default {
@@ -122,6 +122,9 @@
                 custom_setting: state => state.mallConfig.share_setting_custom,
                 share_setting: state => state.mallConfig.share_setting,
             }),
+			...mapGetters('mallConfig', {
+			    getTheme: 'getTheme'
+			}),
             cashName() {
                 switch (this.cashType) {
                     case 'auto':