pages/activity/groupon/list.vue

@@ -125,11 +125,19 @@
   }
   .lvv{
 	background: url('https://zysc.fjptzykj.com:3000/shangcheng/ed254fe4a03c16933e608f8adeb3e700a24ec4620064746a516c10da395b9395.png') !important;
-	background-size: 100% 100%;
+	background-size: 100% 100% !important;
   }
   .bluev{
   	background: url('https://zysc.fjptzykj.com:3000/shangcheng/8728b7f2de5a0d2d8a74ef0c17a275f82b265a3d8d11993ec7c424c3ad454f0b.png') !important;
-  	background-size: 100% 100%;
+  	background-size: 100% 100% !important;
+  }
+  .pinkv{
+  	background: url('https://zysc.fjptzykj.com:3000/shangcheng/b44a3035cd4f676504a7003607bfb9aa457ffe1335c12d1e26dcffb45e3bfec8.png') !important;
+  	background-size: 100% 100% !important;
+  }
+  .orangev{
+  	background: url('https://zysc.fjptzykj.com:3000/shangcheng/ebc89def2a0cf1db1ce6b5aec26407e24e49c85dcf81a1d1c759afe414da033f.png') !important;
+  	background-size: 100% 100% !important;
   }
   .list-content {
     position: relative;

pages/goods/index.vue

@@ -330,6 +330,14 @@
 		background-color:rgba(253,157,17) !important;
 		color:white !important;
 	}
+	.pinkv{
+		background-color:black !important;
+		color:white !important;
+	}
+	.orangev{
+		background-color:rgba(253,157,17) !important;
+		color:white !important;
+	}
   .detail-card {
     background-color: #ffff;
     margin: 14rpx 20rpx;

pages/goods/seckill.vue

@@ -306,6 +306,14 @@
 		background-color:rgba(253,157,17) !important;
 		color:white !important;
 	}
+	.pinkv{
+		background-color:#ff448f !important;
+		color:white !important;
+	}
+	.orangev{
+		background-color:#fe5c2d !important;
+		color:white !important;
+	}
 	.disabled-btn-box[disabled] {
 		background-color: transparent;
 	}

pages/index/components/second-one.vue

@@ -1,8 +1,8 @@
 <!-- 分类展示：second-one 风格  -->
 <template>
-  <view>
+  <view style="    padding: 0 15px;">
     <!-- 一级分类的名字 -->
-    <view class="title-box ss-flex ss-col-center ss-row-center ss-p-b-30">
+    <view class="second-one ss-flex ss-col-center ss-row-center ss-p-b-30">
       <view class="title-line-left" />
       <view class="title-text ss-p-x-20">{{ props.data[activeMenu].name }}</view>
       <view class="title-line-right" />

sheep/components/s-order-card/s-order-card.vue

@@ -65,7 +65,7 @@
 			{
 				title: '待收货',
 				value: '3',
-				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/c2c90f1a7bee3d1d0e933b7ab7c5b186b4dbc0adf8748ceb4e69cabcbfab136f.png',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/cdd41605506b625510a90ce6d8194ad4b66be37ec5bdf6a56ddcf8d9206eff40.png',
 				path: '/pages/order/list',
 				type: 'noget',
 				count: 'deliveredCount',
@@ -73,7 +73,7 @@
 			{
 				title: '待评价',
 				value: '4',
-				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/d392c395c9aa2fa0a6d250b4bad574909945f56cb480b7a05707c4f4e7e23b19.png',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/c2c90f1a7bee3d1d0e933b7ab7c5b186b4dbc0adf8748ceb4e69cabcbfab136f.png',
 				path: '/pages/order/list',
 				type: 'nocomment',
 				count: 'uncommentedCount',
@@ -81,7 +81,7 @@
 			{
 				title: '退款/售后',
 				value: '0',
-				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/cdd41605506b625510a90ce6d8194ad4b66be37ec5bdf6a56ddcf8d9206eff40.png',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/d392c395c9aa2fa0a6d250b4bad574909945f56cb480b7a05707c4f4e7e23b19.png',
 				path: '/pages/order/aftersale/list',
 				type: 'aftersale',
 				count: 'afterSaleCount',
@@ -107,7 +107,7 @@
 			{
 				title: '待收货',
 				value: '3',
-				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/71e01ef9cfe2c54695169248f142dd28d37b56b61fc36622b98b415b70e7b495.png',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/6c69c4f4b1887889a0d0a5ca34a26582a8ba4f0600ae2db3ea6c76a67fcdab59.png',
 				path: '/pages/order/list',
 				type: 'noget',
 				count: 'deliveredCount',
@@ -115,7 +115,7 @@
 			{
 				title: '待评价',
 				value: '4',
-				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/3bcf948bf269e61d0fe709836b2d36f646bfc3adbc968efc9404e41e7be6f04d.png',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/71e01ef9cfe2c54695169248f142dd28d37b56b61fc36622b98b415b70e7b495.png',
 				path: '/pages/order/list',
 				type: 'nocomment',
 				count: 'uncommentedCount',
@@ -123,7 +123,93 @@
 			{
 				title: '退款/售后',
 				value: '0',
-				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/6c69c4f4b1887889a0d0a5ca34a26582a8ba4f0600ae2db3ea6c76a67fcdab59.png',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/3bcf948bf269e61d0fe709836b2d36f646bfc3adbc968efc9404e41e7be6f04d.png',
+				path: '/pages/order/aftersale/list',
+				type: 'aftersale',
+				count: 'afterSaleCount',
+			}
+		]
+
+	} else if (state.themeType == 'pink') {
+		orderMap.value = [{
+				title: '待付款',
+				value: '1',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/f8efe1b47be8b8059469ff33fc401c1c89330409acf9ce7f979528cc3aad3441.png',
+				path: '/pages/order/list',
+				type: 'unpaid',
+				count: 'unpaidCount',
+			},
+			{
+				title: '待发货',
+				value: '2',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/ca96eec5b194101a6aec6d4088c944339b4552e01b605a8fc99a15859579b31f.png',
+				path: '/pages/order/list',
+				type: 'take',
+				count: 'undeliveredCount',
+			},
+			{
+				title: '待收货',
+				value: '3',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/74d8e6ec206bc7f33f577babd3aee0991cd57d4f4fe386bc30af0f37d11133ca.png',
+				path: '/pages/order/list',
+				type: 'noget',
+				count: 'deliveredCount',
+			},
+			{
+				title: '待评价',
+				value: '4',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/ffa9d0bfb0e2efcc213b2ff69d8da9a27bce77a6120eb338195cb1fd089147e0.png',
+				path: '/pages/order/list',
+				type: 'nocomment',
+				count: 'uncommentedCount',
+			},
+			{
+				title: '退款/售后',
+				value: '0',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/5d35ebc74ddb39d70b8c8a03d53aff9023f6f6cafec1a7e0a59f93b2379517c6.png',
+				path: '/pages/order/aftersale/list',
+				type: 'aftersale',
+				count: 'afterSaleCount',
+			}
+		]
+
+	} else if (state.themeType == 'orange') {
+		orderMap.value = [{
+				title: '待付款',
+				value: '1',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/0dd1d348022f3a4afc393e0ca1a903039feeb9931b18903790a12b3cb4d34c80.png',
+				path: '/pages/order/list',
+				type: 'unpaid',
+				count: 'unpaidCount',
+			},
+			{
+				title: '待发货',
+				value: '2',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/f7916da551b40545227bca74dde309a24c6516ba292087a4aed717cac2e499e6.png',
+				path: '/pages/order/list',
+				type: 'take',
+				count: 'undeliveredCount',
+			},
+			{
+				title: '待收货',
+				value: '3',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/6168b9bfe12ffda1805880f4da75546af803565a26ae034b2604f0280f818595.png',
+				path: '/pages/order/list',
+				type: 'noget',
+				count: 'deliveredCount',
+			},
+			{
+				title: '待评价',
+				value: '4',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/837009349108b9f5fee0c490d94c070367dae5312298ddf47421f4706ae884f1.png',
+				path: '/pages/order/list',
+				type: 'nocomment',
+				count: 'uncommentedCount',
+			},
+			{
+				title: '退款/售后',
+				value: '0',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/c1ae501cf8081e1402d85de5de66a63733f79f87d5599eeba98504f3246a9ef7.png',
 				path: '/pages/order/aftersale/list',
 				type: 'aftersale',
 				count: 'afterSaleCount',
@@ -150,7 +236,7 @@
 			{
 				title: '待收货',
 				value: '3',
-				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/a6bc4ea6f95aaaec8b12ce20886d2dd7e1db7b547ba1c52f8b4bebb35f3e7cf3.png',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/686bf80ff876ed116df99552e5649e10ed5a9cddcc7b3cd5adc641ec022366cf.png',
 				path: '/pages/order/list',
 				type: 'noget',
 				count: 'deliveredCount',
@@ -158,7 +244,7 @@
 			{
 				title: '待评价',
 				value: '4',
-				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/f4f14b9cc394e0791928257174fa1b62e05a535f5556f07218f058ffc6cefe80.png',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/a6bc4ea6f95aaaec8b12ce20886d2dd7e1db7b547ba1c52f8b4bebb35f3e7cf3.png',
 				path: '/pages/order/list',
 				type: 'nocomment',
 				count: 'uncommentedCount',
@@ -166,7 +252,7 @@
 			{
 				title: '退款/售后',
 				value: '0',
-				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/686bf80ff876ed116df99552e5649e10ed5a9cddcc7b3cd5adc641ec022366cf.png',
+				icon: 'https://zysc.fjptzykj.com:3000/shangcheng/f4f14b9cc394e0791928257174fa1b62e05a535f5556f07218f058ffc6cefe80.png',
 				path: '/pages/order/aftersale/list',
 				type: 'aftersale',
 				count: 'afterSaleCount',

sheep/components/s-select-sku/s-select-sku.vue

@@ -5,11 +5,7 @@
 		<view class="ss-modal-box bg-white ss-flex-col">
 			<view class="modal-header ss-flex ss-col-center">
 				<view class="header-left ss-m-r-30">
-          <image
+					<image class="sku-image" :src="state.selectedSku.picUrl || goodsInfo.picUrl" mode="aspectFill" />
-            class="sku-image"
-            :src="state.selectedSku.picUrl || goodsInfo.picUrl"
-            mode="aspectFill"
-          />
 				</view>
 				<view class="header-right ss-flex-col ss-row-between ss-flex-1">
 					<view class="goods-title ss-line-2">{{ goodsInfo.name }}</view>
@@ -32,10 +28,7 @@
 					<view class="sku-item ss-m-b-20" v-for="property in propertyList" :key="property.id">
 						<view class="label-text ss-m-b-20">{{ property.name }}</view>
 						<view class="ss-flex ss-col-center ss-flex-wrap">
-              <button
+							<button class="ss-reset-button spec-btn" v-for="value in property.values" :class="[
-                class="ss-reset-button spec-btn"
-                v-for="value in property.values"
-                :class="[
                   {
                     'ui-BG-Main-Gradient': state.currentPropertyArray[property.id] === value.id,
                   },
@@ -48,25 +41,22 @@
 				  {
 				    'blue' : state.themeType == 'blue' && state.currentPropertyArray[property.id] === value.id,
 				  },
-                ]"
+				  {
-                :key="value.id"
+				    'pink' : state.themeType == 'pink' && state.currentPropertyArray[property.id] === value.id,
-                :disabled="value.disabled === true"
+				  },
-                @tap="onSelectSku(property.id, value.id)"
+				  {
-              >
+				    'orange' : state.themeType == 'orange' && state.currentPropertyArray[property.id] === value.id,
+				  },
+                ]" :key="value.id" :disabled="value.disabled === true" @tap="onSelectSku(property.id, value.id)">
 								{{ value.name }}
 							</button>
 						</view>
 					</view>
 					<view class="buy-num-box ss-flex ss-col-center ss-row-between ss-m-b-40">
 						<view class="label-text">购买数量</view>
-            <su-number-box
+						<su-number-box :min="1" :max="state.selectedSku.stock" :step="1"
-              :min="1"
+							v-model="state.selectedSku.goods_num" @change="onNumberChange($event)"
-              :max="state.selectedSku.stock"
+							:vsl=state.themeType />
-              :step="1"
-              v-model="state.selectedSku.goods_num"
-              @change="onNumberChange($event)"
-			  :vsl= state.themeType
-            />
 					</view>
 				</scroll-view>
 			</view>
@@ -74,10 +64,10 @@
 			<!-- 操作区 -->
 			<view class="modal-footer border-top">
 				<view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center">
-          <button :class="state.themeType ? `${state.themeType}v` : ''" class="ss-reset-button add-btn ui-Shadow-Main" @tap="onAddCart"
+					<button :class="state.themeType ? `${state.themeType}v` : ''"
-            >加入购物车</button
+						class="ss-reset-button add-btn ui-Shadow-Main" @tap="onAddCart">加入购物车</button>
-          >
+					<button :class="state.themeType ? state.themeType : ''"
-          <button :class="state.themeType ? state.themeType : ''" class="ss-reset-button buy-btn ui-Shadow-Main" @tap="onBuy">立即购买</button>
+						class="ss-reset-button buy-btn ui-Shadow-Main" @tap="onBuy">立即购买</button>
 				</view>
 			</view>
 		</view>
@@ -85,9 +75,17 @@
 </template>
 
 <script setup>
-  import { computed, reactive, watch } from 'vue';
+	import {
+		computed,
+		reactive,
+		watch
+	} from 'vue';
 	import sheep from '@/sheep';
-  import { formatStock, convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
+	import {
+		formatStock,
+		convertProductPropertyList,
+		fen2yuan
+	} from '@/sheep/hooks/useGoods';
 	const app = computed(() => sheep.$store('app'));
 	const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
 	const props = defineProps({
@@ -122,8 +120,7 @@
 		() => state.selectedSku,
 		(newVal) => {
 			emits('change', newVal);
-    },
+		}, {
-    {
 			immediate: true, // 立即执行
 			deep: true, // 深度监听
 		},
@@ -232,7 +229,8 @@
 			// 如果当前 property id 不存在于有库存的 SKU 中，则禁用
 			for (let valueIndex in propertyList[propertyIndex]['values']) {
 				propertyList[propertyIndex]['values'][valueIndex]['disabled'] =
-          noChooseValueIds.indexOf(propertyList[propertyIndex]['values'][valueIndex]['id']) < 0; // true 禁用 or false 不禁用
+					noChooseValueIds.indexOf(propertyList[propertyIndex]['values'][valueIndex]['id']) <
+					0; // true 禁用 or false 不禁用
 			}
 		}
 	}
@@ -307,10 +305,22 @@
 		background-color: rgba(33, 202, 254) !important;
 		color: white !important;
 	}
+
 	.lvv {
 		background-color: rgba(253, 157, 17) !important;
 		color: white !important;
 	}
+
+	.pinkv {
+		background-color: black !important;
+		color: white !important;
+	}
+
+	.orangev {
+		background-color: rgba(253, 157, 17) !important;
+		color: white !important;
+	}
+
 	// 购买
 	.buy-box {
 		padding: 10rpx 0;

sheep/components/s-tabbar/s-tabbar.vue

@@ -92,6 +92,60 @@
 			}
 		];
 	
+	} else if (state.themeType == 'pink') {
+		Citrn.value = [{
+				text: "首页",
+				url: "/pages/index/index",
+				iconUrl: "http://mall.yudao.iocoder.cn/static/images/1-001.png",
+				activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/0af8fd1f7dd91b22ce8480a4f75591d237f3a359a9d991e4eb333eda96f755fe.png"
+			},
+			{
+				text: "分类",
+				url: "/pages/index/category?id=3",
+				iconUrl: "http://mall.yudao.iocoder.cn/static/images/2-001.png",
+				activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/15548546af5bd5e13ff5c69c5acab5ab0d3d0333b63d583fd0470f3d48bf4e76.png"
+			},
+			{
+				text: "购物车",
+				url: "/pages/index/cart",
+				iconUrl: "http://mall.yudao.iocoder.cn/static/images/3-001.png",
+				activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/27ed7f014ba28a6c257c84c2ad6e8c73335d8e9df2076db4aedff1c5d03c66ba.png"
+			},
+			{
+				text: "我的",
+				url: "/pages/index/user",
+				iconUrl: "http://mall.yudao.iocoder.cn/static/images/4-001.png",
+				activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/059277d5bfe7b44ee74cece09fbe8515f5d021f20b2a9729590265cdf893f31a.png"
+			}
+		];
+	
+	} else if (state.themeType == 'orange') {
+		Citrn.value = [{
+				text: "首页",
+				url: "/pages/index/index",
+				iconUrl: "http://mall.yudao.iocoder.cn/static/images/1-001.png",
+				activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/aab810be4dea52817656ac3ae17ed418561bc4b12b4e33116cb68abaf362311f.png"
+			},
+			{
+				text: "分类",
+				url: "/pages/index/category?id=3",
+				iconUrl: "http://mall.yudao.iocoder.cn/static/images/2-001.png",
+				activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/c972bdc6808b37c9c88eac52bb8feb2bf787874a64b45a5ac3e41be60dee0994.png"
+			},
+			{
+				text: "购物车",
+				url: "/pages/index/cart",
+				iconUrl: "http://mall.yudao.iocoder.cn/static/images/3-001.png",
+				activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/69febc6f7f2371180ae3e11c25bf46c046bdb1b80a14f0b5df3abbea060f47ac.png"
+			},
+			{
+				text: "我的",
+				url: "/pages/index/user",
+				iconUrl: "http://mall.yudao.iocoder.cn/static/images/4-001.png",
+				activeIconUrl: "https://zysc.fjptzykj.com:3000/shangcheng/de40b82a64b9554092cc7c35621ce1a438bbf234e9b43567790a7b9bc1b8f618.png"
+			}
+		];
+	
 	} else {
 		Citrn.value = [{
 				text: "首页",

sheep/components/s-user-card/s-user-card.vue

@@ -1,9 +1,11 @@
 <!-- 装修用户组件：用户卡片 -->
 <template>
 	<view class="ss-user-info-wrap ss-p-t-50" style="z-index: 9999;">
-		<image class="seckill" src="@/static/images/seckilbg.png" v-if="state.themeType == ''"></image>
+		<image class="seckill" src="https://zysc.fjptzykj.com:3000/shangcheng/e08f161b6bf1eddf5132fe4c4b087d75f7e77590a2f546147bd094593db83eb0.png" v-if="state.themeType == ''"></image>
 		<image class="seckill" src="https://zysc.fjptzykj.com:3000/shangcheng/7925fd9e2c1df9cd29462c946f7c54d89d148b03d5fd366864636c3343282a2b.png" v-if="state.themeType == 'lv'"></image>
 		<image class="seckill" src="https://zysc.fjptzykj.com:3000/shangcheng/b350b54f38628fcb465805b81d624717dc83598604c4e58c674ae8558dc7386c.png" v-if="state.themeType == 'blue'"></image>
+		<image class="seckill" src="https://zysc.fjptzykj.com:3000/shangcheng/806e2d991890cab22cbeeb6ac549d5d6179f04099203e3db0256ca25544bfb5a.png" v-if="state.themeType == 'pink'"></image>
+		<image class="seckill" src="https://zysc.fjptzykj.com:3000/shangcheng/ad23c1846977e232b50c3382d526b4d0d8bf2694b04f8090b2e873381cccab8b.png" v-if="state.themeType == 'orange'"></image>
 		<view class="ss-flex ss-col-center ss-row-between ">
 			<view class="left-box ss-flex ss-col-center ss-m-l-36">
 				<view class="avatar-box ss-m-r-24">

sheep/scss/index.scss

@@ -34,3 +34,9 @@ page {
 .blue{
 	background:rgba(28,165,233) !important;
 }
+.pink{
+	background:#ff448f !important;
+}
+.orange{
+	background:#fe5c2d !important;
+}

sheep/ui/su-number-box/su-number-box.vue

@@ -13,6 +13,8 @@
         'seckill-btn': activity === 'seckill',
 		'lvv' : vsl == 'lv',
 		'bluev' : vsl == 'blue',
+		'pinkv' : vsl == 'pink',
+		'orangev' : vsl == 'orange',
       }"
       @click="_calcValue('minus')"
     ></text>
@@ -37,6 +39,8 @@
         'seckill-btn': activity === 'seckill',
 		'lvv' : vsl == 'lv',
 		'bluev' : vsl == 'blue',
+		'pinkv' : vsl == 'pink',
+		'orangev' : vsl == 'orange',
       }"
       @click="_calcValue('plus')"
     ></text>
@@ -199,6 +203,12 @@
 	.lvv{
 		color:rgba(72,204,82) !important;
 	}
+	.pinkv{
+		color:#ff448f !important;
+	}
+	.orangev{
+		color:#fe5c2d !important;
+	}
   .uni-numbox .uni-numbox--disabled {
     color: #c0c0c0 !important;
     /* #ifdef H5 */

sheep/ui/su-tabbar-item/su-tabbar-item.vue

@@ -196,6 +196,12 @@
 	.bluev{
 		color:rgba(28,165,233) !important;
 	}
+	.pinkv{
+		color: #ff448f !important;
+	}
+	.orangev{
+		color: #fe5c2d !important;
+	}
   .tabbar-center-item {
     height: 40px;
     width: 40px;