diff --git a/app/common/dao/store/StoreActivityUserDao.php b/app/common/dao/store/StoreActivityUserDao.php index ca0b69a1..1006aa55 100755 --- a/app/common/dao/store/StoreActivityUserDao.php +++ b/app/common/dao/store/StoreActivityUserDao.php @@ -235,6 +235,7 @@ class StoreActivityUserDao extends BaseDao $query = UserBill::field('link_id,create_time,number coupon_price,mark') ->where('uid', $userId) ->where('category', 'red_pack') + ->where('status', 1) ->where('type', "red_pack_{$type}"); $count = $query->count(); $record = $query->page($page)->limit($limit)->select()->toArray(); diff --git a/app/common/dao/store/consumption/StoreConsumptionUserDao.php b/app/common/dao/store/consumption/StoreConsumptionUserDao.php index 13bc530a..e088f138 100755 --- a/app/common/dao/store/consumption/StoreConsumptionUserDao.php +++ b/app/common/dao/store/consumption/StoreConsumptionUserDao.php @@ -49,6 +49,9 @@ class StoreConsumptionUserDao extends BaseDao /** @var float $profitRate 商品毛利率 */ public $profitRate; + public $startTime; + public $endTime; + protected function getModel(): string { return StoreConsumptionUser::class; @@ -233,7 +236,7 @@ class StoreConsumptionUserDao extends BaseDao */ public function send($consumption, float $rate, int $userId, string $groupOrderIds, float $amount, $status = -2, $type = 1) { - $title = $type == StoreConsumptionUser::TYPE_TWO ? '现金抵扣补贴' : '无门槛实物通用补贴'; + $title = $type == StoreConsumptionUser::TYPE_TWO ? '春耕采购补贴' : '春耕采购余额'; $model = StoreConsumptionUser::where('uid', $userId)->where('type', StoreConsumptionUser::TYPE_TWO)->find(); $couponPrice = bcmul($amount, $rate, 2); if (!empty($model) && $model['type'] == $type) { @@ -249,8 +252,8 @@ class StoreConsumptionUserDao extends BaseDao $model->balance = $model->coupon_price; $model->order_amount = $amount; $model->create_time = date('Y-m-d H:i:s'); - $model->start_time = date('Y-m-d H:i:s', time() + 7 * 86400); - $model->end_time = '2026-01-15 23:59:59'; + $model->start_time = $this->startTime ?: date('Y-m-d H:i:s', time() + 7 * 86400); + $model->end_time = $this->endTime ?: '2026-01-15 23:59:59'; $model->type = $type; $model->status = $status; } @@ -268,7 +271,7 @@ class StoreConsumptionUserDao extends BaseDao } $userBillRepository->incBill($userId, 'red_pack', "red_pack_{$type}", [ 'link_id' => $model['coupon_user_id'], - 'status' => 1, + 'status' => $status == -1 ?: 1, 'title' => '获得' . $title, 'number' => $couponPrice, 'mark' => '获得' . $title . $couponPrice . ",订单金额:{$amount}", diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index 04b1799d..e2523944 100755 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -7,6 +7,7 @@ use app\common\dao\store\order\StoreCartDao; use app\common\dao\store\StoreActivityDao; use app\common\model\store\order\StoreGroupOrder; use app\common\model\store\order\StoreOrder; +use app\common\model\store\product\ProductCate; use app\common\model\system\merchant\Merchant; use app\common\repositories\community\CommunityRepository; use app\common\repositories\store\coupon\StoreCouponRepository; @@ -81,8 +82,32 @@ class StoreOrderCreateRepository extends StoreOrderRepository //检查商品类型, 活动商品只能单独购买 $allowDelivery = true; $activityProductCount = 0; + //判断是否是平台购物卡,购物卡不允许使用任何优惠券 + $merchantCate = $merchantCartList[0]['list'][0]->product->merCateId; + $isPlatformCard = false; + if (!empty($merchantCate) && in_array(env('PLATFORM_CARD_CATE_ID'), array_column($merchantCate->toArray(), 'mer_cate_id'))) { + $isPlatformCard = true; + } + if ($isPlatformCard) { + $merchantTypeId = Merchant::where('uid', $uid)->value('type_id'); + if (empty($merchantTypeId) || $merchantTypeId != 21) { + throw new ValidateException('大礼包仅限种养殖户购买'); + } + //平台购物卡仅能购买一次 + $productIds = ProductCate::where('mer_cate_id', env('PLATFORM_CARD_CATE_ID'))->column('product_id'); + $orderRecord = StoreOrder::alias('t1') + ->leftJoin('store_order_product t2', 't1.order_id = t2.order_id') + ->whereIn('product_id', $productIds) + ->where('t1.uid', $uid) + ->where('paid', 1) + ->where('is_refund', 0) + ->count(); + if ($orderRecord > 0) { + throw new ValidateException('大礼包仅能购买一次'); + } + } foreach ($merchantCartList as $merchantCart) { - if (($merchantCart['type_id'] != Merchant::TypeSupplyChain) && $address && $merchantCart['list'][0]['product_type'] != 2) { + if (($merchantCart['type_id'] != Merchant::TypeSupplyChain) && $address && $merchantCart['list'][0]['product_type'] != 2 && $merchantCart['list'][0]['product']['type'] != 1) { if ($merchantCart['street_id'] != $address['street_code'] && $createOrder && !in_array($merchantCart['mer_id'], $takes)) { throw new ValidateException('不支持跨区域购买,请在【我的】-【地址管理】更改后重新购买'); } @@ -135,7 +160,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository $order_extend = json_decode($cart['product']['extend'], true); } if ($address) { - if ($cart['source'] == 0 || $cart['source'] == 103) { + if (($cart['source'] == 0 || $cart['source'] == 103) && $cart['product']['type'] != 1) { $userAddressCode = ($address['province_code'] ?? '') . ',' . ($address['city_code'] ?? '') . ',' . ($address['district_code'] ?? '') . ',' . ($address['street_code'] ?? '') . ',' . ($address['village_code'] ?? '') . ',' . ($address['brigade_id'] ?? 0); $getUrl = env('LOGISTICS_HOST_URL') . '/api/hasCourier?user_address_code=' . $userAddressCode; $curl = new Curl(); @@ -161,13 +186,12 @@ class StoreOrderCreateRepository extends StoreOrderRepository $presellType = 0; $consumption_coupon_id = 0; $fn = []; - if (in_array($source, [0, 2, 103])) { - $enabledPlatformCoupon = true; - } else { - $enabledPlatformCoupon = false; - } + $enabledPlatformCoupon = true; $order_total_postage = 0; $platformCoupon = []; + if ($isPlatformCard) { + $enabledPlatformCoupon = false; + } //套餐订单 @@ -247,7 +271,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository $enabledCoupon = !($order_type && $order_type != 2); //只有预售和普通商品可以用优惠券 - if (!$enabledCoupon) { + if (!$enabledCoupon || $isPlatformCard) { $merchantCart['coupon'] = []; } $svip_coupon_merge = merchantConfig($merchantCart['mer_id'], 'svip_coupon_merge'); @@ -521,22 +545,19 @@ class StoreOrderCreateRepository extends StoreOrderRepository // if ($total_true_price > 0) { $StoreCouponUser = app()->make(StoreCouponUserRepository::class); $platformCoupon = $StoreCouponUser->validUserPlatformCoupon($uid); - $platformConsumption = []; //消费金 - if ($source == 103) { - $ConsumptionWhere = [ - 'uid' => $uid, - 'status' => 0, - 'is_fail' => 0 - ]; + $ConsumptionWhere = [ + 'uid' => $uid, + 'status' => 0, + 'is_fail' => 0 + ]; - $platformConsumption = Db::name('store_consumption_user')->where($ConsumptionWhere)->limit(100)->order('create_time', 'desc') - ->field('coupon_user_id,uid,coupon_title,coupon_price,balance,start_time,end_time') - ->select()->each(function ($item) { - $item['describe'] = '仅限平台指定商家商品可使用'; - return $item; - }); - } + $platformConsumption = Db::name('store_consumption_user')->where($ConsumptionWhere)->limit(100)->order('create_time', 'desc') + ->field('coupon_user_id,uid,coupon_title,coupon_price,balance,start_time,end_time') + ->select()->each(function ($item) { + $item['describe'] = '仅限平台指定商家商品可使用'; + return $item; + }); // } $usePlatformCouponId = 0; @@ -629,7 +650,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository $consumptionTotal = 0; $consumptionUsed = 0; $groupOrderPayPrice = 0; - if ($consumption_id > 0 && $this->store_consumption_user && $source == 103) { + if ($consumption_id > 0 && $this->store_consumption_user) { $consumptionTotal = min($order_total_price, $this->balance); } foreach ($merchantCartList as $k => &$merchantCart) { @@ -728,7 +749,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository $order_model = $orderInfo['order_model']; $order_extend = $orderInfo['order_extend']; if ($pay_type == 'balance' && $orderInfo['source'] != 103 && $orderInfo['source'] != 105) { - throw new ValidateException('余额支付只能用于里海云仓'); +// throw new ValidateException('余额支付只能用于里海云仓'); } // 以下判断无意义,v2CartIdByOrderInfo 已经判断过收货地址或自提地址 // if (!$orderInfo['order_delivery_status']) { diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 1ebd64da..50e76908 100755 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -361,6 +361,19 @@ class StoreOrderRepository extends BaseRepository // "惠农供销,谱写数字新篇章"活动首单分润,商户和村、小组合伙人 $financeDao = (new CommissionDao())->firstOrderCommission($order, $financeDao); } + + //判断是否是平台购物卡 + $merchantCate = $order->orderProduct[0]->product->merCateId; + if (!empty($merchantCate) && in_array(env('PLATFORM_CARD_CATE_ID'), array_column($merchantCate->toArray(), 'mer_cate_id'))) { + //购物卡自动发货 + $deliveryData = [ + 'delivery_type' => 3, + 'remark' => '', + 'delivery_name' => '', + 'delivery_id' => '', + ]; + $this->runDelivery($order['order_id'], $order['mer_id'], $deliveryData, ['is_split' => 0, 'split' => []], 'delivery'); + } } //分销判断 // if ($groupOrder->user->spread_uid) { diff --git a/app/event.php b/app/event.php index 039bcf71..9c80c6cf 100755 --- a/app/event.php +++ b/app/event.php @@ -56,6 +56,7 @@ return [ \crmeb\listens\CloseUserSvipListen::class, \crmeb\listens\SendSvipCouponListen::class, \crmeb\listens\AutoCheckCreditBuyListen::class, + \crmeb\listens\ActivateConsumptionListen::class, ] : [], 'pay_success_user_recharge' => [\crmeb\listens\pay\UserRechargeSuccessListen::class], 'pay_success_user_order' => [\crmeb\listens\pay\UserOrderSuccessListen::class], @@ -77,6 +78,7 @@ return [ 'refund.deliver'=>[\app\listener\DeliverRefund::class], 'order.create'=>[\app\listener\OrderCreate::class], 'order.take'=>[\app\listener\OrderTake::class], + 'order.delivery' => [\crmeb\listens\OrderDeliveryListen::class], // 发货事件 ], 'subscribe' => [], diff --git a/crmeb/listens/ActivateConsumptionListen.php b/crmeb/listens/ActivateConsumptionListen.php new file mode 100644 index 00000000..fbb63663 --- /dev/null +++ b/crmeb/listens/ActivateConsumptionListen.php @@ -0,0 +1,48 @@ +tick(1000 * 60, function () { + Log::info('定时任务:激活商户补贴'); + $couponId = StoreConsumption::where('type', StoreConsumption::TYPE_RECHARGE)->value('coupon_id'); + if (empty($couponId)) { + return; + } + $storeConsumptionUser = StoreConsumptionUser::where('coupon_id', $couponId) + ->where('status', StoreConsumptionUser::STATUS_REPEAL) + ->select(); + foreach ($storeConsumptionUser as $item) { + $isUsed = StoreConsumptionUser::where('order_id_set', $item['order_id_set']) + ->where('balance', 0) + ->count(); + $merchantId = Merchant::where('uid', $item['uid'])->value('mer_id'); + $saleTotal = StoreOrder::where('mer_id', $merchantId)->whereIn('status', [2, 3])->sum('pay_price'); + if ($saleTotal >= $item['order_amount'] && $isUsed > 0) { + $item->status = StoreConsumptionUser::STATUS_UNUSED; + $item->start_time = date('Y-m-d H:i:s'); + $item->end_time = date('Y-m-d H:i:s', strtotime('+1 year')); + $item->save(); + UserBill::where('link_id', $item['coupon_user_id'])->where('type', 'red_pack_2')->update(['status', 1]); + } + } + }); + } + +} diff --git a/crmeb/listens/OrderDeliveryListen.php b/crmeb/listens/OrderDeliveryListen.php new file mode 100644 index 00000000..bf994cc5 --- /dev/null +++ b/crmeb/listens/OrderDeliveryListen.php @@ -0,0 +1,53 @@ +orderProduct as $orderProduct) { + $merchantCate = $orderProduct->product->merCateId; + if (empty($merchantCate) || $merchantCate[0]['mer_cate_id'] != env('PLATFORM_CARD_CATE_ID')) { + continue; + } + $consumption = StoreConsumption::where('type', StoreConsumption::TYPE_PULL_CONSUMPTION)->find(); + /** @var StoreConsumptionUserDao $repo */ + $repo = app()->make(StoreConsumptionUserDao::class); + $repo->startTime = date('Y-m-d H:i:s'); + $repo->endTime = '2025-07-01'; + $repo->send($consumption, 1, $order['uid'], $order['group_order_id'], $order->total_price, StoreConsumptionUser::STATUS_UNUSED); + + //TODO 当商户销售和购买达到指定金额后,激活抵扣补贴 + $consumption = StoreConsumption::where('type', StoreConsumption::TYPE_RECHARGE)->find(); + $repo->startTime = date('Y-m-d H:i:s'); + $repo->endTime = '2025-07-01'; + $rate = $this->getRate($order->total_price); + $repo->send($consumption, $rate, $order['uid'], $order['group_order_id'], $order->total_price, StoreConsumptionUser::STATUS_REPEAL, StoreConsumptionUser::TYPE_TWO); + } + } + + public function getRate($orderAmount) + { + if ($orderAmount >= 1000 && $orderAmount < 5000) { + $rate = 0.05; + } elseif ($orderAmount >= 5000 && $orderAmount < 10000) { + $rate = 0.10; + } elseif ($orderAmount >= 10000 && $orderAmount < 50000) { + $rate = 0.15; + } elseif ($orderAmount >= 50000 && $orderAmount <= 100000) { + $rate = 0.20; + } + return $rate ?? 0; + } + +} diff --git a/public/static/diy/alipay_wait_blue.png b/public/static/diy/alipay_wait_blue.png new file mode 100644 index 00000000..950d59f7 Binary files /dev/null and b/public/static/diy/alipay_wait_blue.png differ diff --git a/public/static/diy/alipay_wait_default.png b/public/static/diy/alipay_wait_default.png new file mode 100644 index 00000000..0c8e1aeb Binary files /dev/null and b/public/static/diy/alipay_wait_default.png differ diff --git a/public/static/diy/alipay_wait_green.png b/public/static/diy/alipay_wait_green.png new file mode 100644 index 00000000..333cdd82 Binary files /dev/null and b/public/static/diy/alipay_wait_green.png differ diff --git a/public/static/diy/alipay_wait_orange.png b/public/static/diy/alipay_wait_orange.png new file mode 100644 index 00000000..b5a94bdc Binary files /dev/null and b/public/static/diy/alipay_wait_orange.png differ diff --git a/public/static/diy/alipay_wait_pink.png b/public/static/diy/alipay_wait_pink.png new file mode 100644 index 00000000..d12d0488 Binary files /dev/null and b/public/static/diy/alipay_wait_pink.png differ diff --git a/public/static/diy/alipay_wait_purple.png b/public/static/diy/alipay_wait_purple.png new file mode 100644 index 00000000..aa2e9fed Binary files /dev/null and b/public/static/diy/alipay_wait_purple.png differ diff --git a/public/static/diy/alter_blue.png b/public/static/diy/alter_blue.png new file mode 100644 index 00000000..b8a2efd6 Binary files /dev/null and b/public/static/diy/alter_blue.png differ diff --git a/public/static/diy/alter_default.png b/public/static/diy/alter_default.png new file mode 100644 index 00000000..90b73949 Binary files /dev/null and b/public/static/diy/alter_default.png differ diff --git a/public/static/diy/alter_green.png b/public/static/diy/alter_green.png new file mode 100644 index 00000000..07efb4b9 Binary files /dev/null and b/public/static/diy/alter_green.png differ diff --git a/public/static/diy/alter_orange.png b/public/static/diy/alter_orange.png new file mode 100644 index 00000000..957c3e4c Binary files /dev/null and b/public/static/diy/alter_orange.png differ diff --git a/public/static/diy/alter_pink.png b/public/static/diy/alter_pink.png new file mode 100644 index 00000000..31664b93 Binary files /dev/null and b/public/static/diy/alter_pink.png differ diff --git a/public/static/diy/alter_purple.png b/public/static/diy/alter_purple.png new file mode 100644 index 00000000..8e781687 Binary files /dev/null and b/public/static/diy/alter_purple.png differ diff --git a/public/static/diy/assist_bg_blue.png b/public/static/diy/assist_bg_blue.png new file mode 100644 index 00000000..5353e51b Binary files /dev/null and b/public/static/diy/assist_bg_blue.png differ diff --git a/public/static/diy/assist_bg_default.png b/public/static/diy/assist_bg_default.png new file mode 100644 index 00000000..24bc8f25 Binary files /dev/null and b/public/static/diy/assist_bg_default.png differ diff --git a/public/static/diy/assist_bg_green.png b/public/static/diy/assist_bg_green.png new file mode 100644 index 00000000..16e16cdf Binary files /dev/null and b/public/static/diy/assist_bg_green.png differ diff --git a/public/static/diy/assist_bg_orange.png b/public/static/diy/assist_bg_orange.png new file mode 100644 index 00000000..24bc8f25 Binary files /dev/null and b/public/static/diy/assist_bg_orange.png differ diff --git a/public/static/diy/assist_bg_pink.png b/public/static/diy/assist_bg_pink.png new file mode 100644 index 00000000..8e30debc Binary files /dev/null and b/public/static/diy/assist_bg_pink.png differ diff --git a/public/static/diy/assist_bg_purple.png b/public/static/diy/assist_bg_purple.png new file mode 100644 index 00000000..8d118397 Binary files /dev/null and b/public/static/diy/assist_bg_purple.png differ diff --git a/public/static/diy/assist_detail1_blue.png b/public/static/diy/assist_detail1_blue.png new file mode 100644 index 00000000..8c2607e8 Binary files /dev/null and b/public/static/diy/assist_detail1_blue.png differ diff --git a/public/static/diy/assist_detail1_default.png b/public/static/diy/assist_detail1_default.png new file mode 100644 index 00000000..19194eec Binary files /dev/null and b/public/static/diy/assist_detail1_default.png differ diff --git a/public/static/diy/assist_detail1_green.png b/public/static/diy/assist_detail1_green.png new file mode 100644 index 00000000..9edcb000 Binary files /dev/null and b/public/static/diy/assist_detail1_green.png differ diff --git a/public/static/diy/assist_detail1_orange.png b/public/static/diy/assist_detail1_orange.png new file mode 100644 index 00000000..ebb9d229 Binary files /dev/null and b/public/static/diy/assist_detail1_orange.png differ diff --git a/public/static/diy/assist_detail1_pink.png b/public/static/diy/assist_detail1_pink.png new file mode 100644 index 00000000..f5b8d297 Binary files /dev/null and b/public/static/diy/assist_detail1_pink.png differ diff --git a/public/static/diy/assist_detail1_purple.png b/public/static/diy/assist_detail1_purple.png new file mode 100644 index 00000000..c1ab9268 Binary files /dev/null and b/public/static/diy/assist_detail1_purple.png differ diff --git a/public/static/diy/assist_detail2_blue.png b/public/static/diy/assist_detail2_blue.png new file mode 100644 index 00000000..ed4981c8 Binary files /dev/null and b/public/static/diy/assist_detail2_blue.png differ diff --git a/public/static/diy/assist_detail2_default.png b/public/static/diy/assist_detail2_default.png new file mode 100644 index 00000000..b75fe268 Binary files /dev/null and b/public/static/diy/assist_detail2_default.png differ diff --git a/public/static/diy/assist_detail2_green.png b/public/static/diy/assist_detail2_green.png new file mode 100644 index 00000000..5feff3de Binary files /dev/null and b/public/static/diy/assist_detail2_green.png differ diff --git a/public/static/diy/assist_detail2_orange.png b/public/static/diy/assist_detail2_orange.png new file mode 100644 index 00000000..b75fe268 Binary files /dev/null and b/public/static/diy/assist_detail2_orange.png differ diff --git a/public/static/diy/assist_detail2_pink.png b/public/static/diy/assist_detail2_pink.png new file mode 100644 index 00000000..db647271 Binary files /dev/null and b/public/static/diy/assist_detail2_pink.png differ diff --git a/public/static/diy/assist_detail2_purple.png b/public/static/diy/assist_detail2_purple.png new file mode 100644 index 00000000..53da045a Binary files /dev/null and b/public/static/diy/assist_detail2_purple.png differ diff --git a/public/static/diy/combination_blue.png b/public/static/diy/combination_blue.png new file mode 100644 index 00000000..95ba5059 Binary files /dev/null and b/public/static/diy/combination_blue.png differ diff --git a/public/static/diy/combination_default.png b/public/static/diy/combination_default.png new file mode 100644 index 00000000..ce6cf04b Binary files /dev/null and b/public/static/diy/combination_default.png differ diff --git a/public/static/diy/combination_green.png b/public/static/diy/combination_green.png new file mode 100644 index 00000000..9418cd1e Binary files /dev/null and b/public/static/diy/combination_green.png differ diff --git a/public/static/diy/combination_orange.png b/public/static/diy/combination_orange.png new file mode 100644 index 00000000..a901c6b8 Binary files /dev/null and b/public/static/diy/combination_orange.png differ diff --git a/public/static/diy/combination_pink.png b/public/static/diy/combination_pink.png new file mode 100644 index 00000000..46f6980a Binary files /dev/null and b/public/static/diy/combination_pink.png differ diff --git a/public/static/diy/combination_purple.png b/public/static/diy/combination_purple.png new file mode 100644 index 00000000..1cc0eb8d Binary files /dev/null and b/public/static/diy/combination_purple.png differ diff --git a/public/static/diy/couponBg_blue.png b/public/static/diy/couponBg_blue.png new file mode 100644 index 00000000..ac41b1e3 Binary files /dev/null and b/public/static/diy/couponBg_blue.png differ diff --git a/public/static/diy/couponBg_default.png b/public/static/diy/couponBg_default.png new file mode 100644 index 00000000..7da6b9e9 Binary files /dev/null and b/public/static/diy/couponBg_default.png differ diff --git a/public/static/diy/couponBg_green.png b/public/static/diy/couponBg_green.png new file mode 100644 index 00000000..22db6c8a Binary files /dev/null and b/public/static/diy/couponBg_green.png differ diff --git a/public/static/diy/couponBg_orange.png b/public/static/diy/couponBg_orange.png new file mode 100644 index 00000000..2ff5f841 Binary files /dev/null and b/public/static/diy/couponBg_orange.png differ diff --git a/public/static/diy/couponBg_pink.png b/public/static/diy/couponBg_pink.png new file mode 100644 index 00000000..427cf20e Binary files /dev/null and b/public/static/diy/couponBg_pink.png differ diff --git a/public/static/diy/couponBg_purple.png b/public/static/diy/couponBg_purple.png new file mode 100644 index 00000000..a16d5a55 Binary files /dev/null and b/public/static/diy/couponBg_purple.png differ diff --git a/public/static/diy/couponWindow_blue.png b/public/static/diy/couponWindow_blue.png new file mode 100644 index 00000000..15d29df7 Binary files /dev/null and b/public/static/diy/couponWindow_blue.png differ diff --git a/public/static/diy/couponWindow_default.png b/public/static/diy/couponWindow_default.png new file mode 100644 index 00000000..e9278cb4 Binary files /dev/null and b/public/static/diy/couponWindow_default.png differ diff --git a/public/static/diy/couponWindow_green.png b/public/static/diy/couponWindow_green.png new file mode 100644 index 00000000..1756cb2f Binary files /dev/null and b/public/static/diy/couponWindow_green.png differ diff --git a/public/static/diy/couponWindow_orange.png b/public/static/diy/couponWindow_orange.png new file mode 100644 index 00000000..7372e97e Binary files /dev/null and b/public/static/diy/couponWindow_orange.png differ diff --git a/public/static/diy/couponWindow_pink.png b/public/static/diy/couponWindow_pink.png new file mode 100644 index 00000000..aff25e91 Binary files /dev/null and b/public/static/diy/couponWindow_pink.png differ diff --git a/public/static/diy/couponWindow_purple.png b/public/static/diy/couponWindow_purple.png new file mode 100644 index 00000000..d3ab32d0 Binary files /dev/null and b/public/static/diy/couponWindow_purple.png differ diff --git a/public/static/diy/coupon_blue.png b/public/static/diy/coupon_blue.png new file mode 100644 index 00000000..d9075783 Binary files /dev/null and b/public/static/diy/coupon_blue.png differ diff --git a/public/static/diy/coupon_default.png b/public/static/diy/coupon_default.png new file mode 100644 index 00000000..93fb8300 Binary files /dev/null and b/public/static/diy/coupon_default.png differ diff --git a/public/static/diy/coupon_green.png b/public/static/diy/coupon_green.png new file mode 100644 index 00000000..9a35f309 Binary files /dev/null and b/public/static/diy/coupon_green.png differ diff --git a/public/static/diy/coupon_orange.png b/public/static/diy/coupon_orange.png new file mode 100644 index 00000000..0aabba2c Binary files /dev/null and b/public/static/diy/coupon_orange.png differ diff --git a/public/static/diy/coupon_pink.png b/public/static/diy/coupon_pink.png new file mode 100644 index 00000000..e8df6ef5 Binary files /dev/null and b/public/static/diy/coupon_pink.png differ diff --git a/public/static/diy/coupon_purple.png b/public/static/diy/coupon_purple.png new file mode 100644 index 00000000..7c07ab0c Binary files /dev/null and b/public/static/diy/coupon_purple.png differ diff --git a/public/static/diy/currentAcc_blue.png b/public/static/diy/currentAcc_blue.png new file mode 100644 index 00000000..a67d4fc1 Binary files /dev/null and b/public/static/diy/currentAcc_blue.png differ diff --git a/public/static/diy/currentAcc_default.png b/public/static/diy/currentAcc_default.png new file mode 100644 index 00000000..7ded5086 Binary files /dev/null and b/public/static/diy/currentAcc_default.png differ diff --git a/public/static/diy/currentAcc_green.png b/public/static/diy/currentAcc_green.png new file mode 100644 index 00000000..a7ec64c8 Binary files /dev/null and b/public/static/diy/currentAcc_green.png differ diff --git a/public/static/diy/currentAcc_orange.png b/public/static/diy/currentAcc_orange.png new file mode 100644 index 00000000..94081750 Binary files /dev/null and b/public/static/diy/currentAcc_orange.png differ diff --git a/public/static/diy/currentAcc_pink.png b/public/static/diy/currentAcc_pink.png new file mode 100644 index 00000000..dc2f31fb Binary files /dev/null and b/public/static/diy/currentAcc_pink.png differ diff --git a/public/static/diy/currentAcc_purple.png b/public/static/diy/currentAcc_purple.png new file mode 100644 index 00000000..58c01ffa Binary files /dev/null and b/public/static/diy/currentAcc_purple.png differ diff --git a/public/static/diy/distribution_blue.png b/public/static/diy/distribution_blue.png new file mode 100644 index 00000000..4955e3a8 Binary files /dev/null and b/public/static/diy/distribution_blue.png differ diff --git a/public/static/diy/distribution_default.png b/public/static/diy/distribution_default.png new file mode 100644 index 00000000..2ceac58b Binary files /dev/null and b/public/static/diy/distribution_default.png differ diff --git a/public/static/diy/distribution_green.png b/public/static/diy/distribution_green.png new file mode 100644 index 00000000..c159f8a3 Binary files /dev/null and b/public/static/diy/distribution_green.png differ diff --git a/public/static/diy/distribution_orange.png b/public/static/diy/distribution_orange.png new file mode 100644 index 00000000..70e2991d Binary files /dev/null and b/public/static/diy/distribution_orange.png differ diff --git a/public/static/diy/distribution_pink.png b/public/static/diy/distribution_pink.png new file mode 100644 index 00000000..06d29f6b Binary files /dev/null and b/public/static/diy/distribution_pink.png differ diff --git a/public/static/diy/distribution_purple.png b/public/static/diy/distribution_purple.png new file mode 100644 index 00000000..d0225c31 Binary files /dev/null and b/public/static/diy/distribution_purple.png differ diff --git a/public/static/diy/down_blue.png b/public/static/diy/down_blue.png new file mode 100644 index 00000000..b83d716e Binary files /dev/null and b/public/static/diy/down_blue.png differ diff --git a/public/static/diy/down_default.png b/public/static/diy/down_default.png new file mode 100644 index 00000000..98dfb248 Binary files /dev/null and b/public/static/diy/down_default.png differ diff --git a/public/static/diy/down_green.png b/public/static/diy/down_green.png new file mode 100644 index 00000000..b0e53270 Binary files /dev/null and b/public/static/diy/down_green.png differ diff --git a/public/static/diy/down_orange.png b/public/static/diy/down_orange.png new file mode 100644 index 00000000..056e50bc Binary files /dev/null and b/public/static/diy/down_orange.png differ diff --git a/public/static/diy/down_pink.png b/public/static/diy/down_pink.png new file mode 100644 index 00000000..41967c96 Binary files /dev/null and b/public/static/diy/down_pink.png differ diff --git a/public/static/diy/down_purple.png b/public/static/diy/down_purple.png new file mode 100644 index 00000000..b7d9f1d3 Binary files /dev/null and b/public/static/diy/down_purple.png differ diff --git a/public/static/diy/left_blue.png b/public/static/diy/left_blue.png new file mode 100644 index 00000000..054c71f2 Binary files /dev/null and b/public/static/diy/left_blue.png differ diff --git a/public/static/diy/left_default.png b/public/static/diy/left_default.png new file mode 100644 index 00000000..84518314 Binary files /dev/null and b/public/static/diy/left_default.png differ diff --git a/public/static/diy/left_green.png b/public/static/diy/left_green.png new file mode 100644 index 00000000..f598deb7 Binary files /dev/null and b/public/static/diy/left_green.png differ diff --git a/public/static/diy/left_orange.png b/public/static/diy/left_orange.png new file mode 100644 index 00000000..ff8f8741 Binary files /dev/null and b/public/static/diy/left_orange.png differ diff --git a/public/static/diy/left_pink.png b/public/static/diy/left_pink.png new file mode 100644 index 00000000..2373bf2c Binary files /dev/null and b/public/static/diy/left_pink.png differ diff --git a/public/static/diy/left_purple.png b/public/static/diy/left_purple.png new file mode 100644 index 00000000..59adaab3 Binary files /dev/null and b/public/static/diy/left_purple.png differ diff --git a/public/static/diy/linefx_blue.png b/public/static/diy/linefx_blue.png new file mode 100644 index 00000000..1c9949aa Binary files /dev/null and b/public/static/diy/linefx_blue.png differ diff --git a/public/static/diy/linefx_default.png b/public/static/diy/linefx_default.png new file mode 100644 index 00000000..9d82a2ea Binary files /dev/null and b/public/static/diy/linefx_default.png differ diff --git a/public/static/diy/linefx_green.png b/public/static/diy/linefx_green.png new file mode 100644 index 00000000..2971a642 Binary files /dev/null and b/public/static/diy/linefx_green.png differ diff --git a/public/static/diy/linefx_orange.png b/public/static/diy/linefx_orange.png new file mode 100644 index 00000000..6c87498d Binary files /dev/null and b/public/static/diy/linefx_orange.png differ diff --git a/public/static/diy/linefx_pink.png b/public/static/diy/linefx_pink.png new file mode 100644 index 00000000..314e9517 Binary files /dev/null and b/public/static/diy/linefx_pink.png differ diff --git a/public/static/diy/linefx_purple.png b/public/static/diy/linefx_purple.png new file mode 100644 index 00000000..6727b845 Binary files /dev/null and b/public/static/diy/linefx_purple.png differ diff --git a/public/static/diy/merchantBg.jpg b/public/static/diy/merchantBg.jpg new file mode 100644 index 00000000..b9fe2a01 Binary files /dev/null and b/public/static/diy/merchantBg.jpg differ diff --git a/public/static/diy/merchantBg_blue.jpg b/public/static/diy/merchantBg_blue.jpg new file mode 100644 index 00000000..4c67b1ec Binary files /dev/null and b/public/static/diy/merchantBg_blue.jpg differ diff --git a/public/static/diy/merchantBg_default.jpg b/public/static/diy/merchantBg_default.jpg new file mode 100644 index 00000000..93ba0c9e Binary files /dev/null and b/public/static/diy/merchantBg_default.jpg differ diff --git a/public/static/diy/merchantBg_green.jpg b/public/static/diy/merchantBg_green.jpg new file mode 100644 index 00000000..41603760 Binary files /dev/null and b/public/static/diy/merchantBg_green.jpg differ diff --git a/public/static/diy/merchantBg_orange.jpg b/public/static/diy/merchantBg_orange.jpg new file mode 100644 index 00000000..bd493dd4 Binary files /dev/null and b/public/static/diy/merchantBg_orange.jpg differ diff --git a/public/static/diy/merchantBg_pink.jpg b/public/static/diy/merchantBg_pink.jpg new file mode 100644 index 00000000..4bc2acf9 Binary files /dev/null and b/public/static/diy/merchantBg_pink.jpg differ diff --git a/public/static/diy/merchantBg_purple.jpg b/public/static/diy/merchantBg_purple.jpg new file mode 100644 index 00000000..57dfa2d3 Binary files /dev/null and b/public/static/diy/merchantBg_purple.jpg differ diff --git a/public/static/diy/navbtn_close_blue.gif b/public/static/diy/navbtn_close_blue.gif new file mode 100644 index 00000000..e6c5828d Binary files /dev/null and b/public/static/diy/navbtn_close_blue.gif differ diff --git a/public/static/diy/navbtn_close_default.gif b/public/static/diy/navbtn_close_default.gif new file mode 100644 index 00000000..f6d40a7a Binary files /dev/null and b/public/static/diy/navbtn_close_default.gif differ diff --git a/public/static/diy/navbtn_close_green.gif b/public/static/diy/navbtn_close_green.gif new file mode 100644 index 00000000..4f4364a9 Binary files /dev/null and b/public/static/diy/navbtn_close_green.gif differ diff --git a/public/static/diy/navbtn_close_orange.gif b/public/static/diy/navbtn_close_orange.gif new file mode 100644 index 00000000..54f2aea7 Binary files /dev/null and b/public/static/diy/navbtn_close_orange.gif differ diff --git a/public/static/diy/navbtn_close_pink.gif b/public/static/diy/navbtn_close_pink.gif new file mode 100644 index 00000000..1f5c3c86 Binary files /dev/null and b/public/static/diy/navbtn_close_pink.gif differ diff --git a/public/static/diy/navbtn_close_purple.gif b/public/static/diy/navbtn_close_purple.gif new file mode 100644 index 00000000..2d5fe77c Binary files /dev/null and b/public/static/diy/navbtn_close_purple.gif differ diff --git a/public/static/diy/navbtn_open_blue.gif b/public/static/diy/navbtn_open_blue.gif new file mode 100644 index 00000000..a00b5837 Binary files /dev/null and b/public/static/diy/navbtn_open_blue.gif differ diff --git a/public/static/diy/navbtn_open_default.gif b/public/static/diy/navbtn_open_default.gif new file mode 100644 index 00000000..69f747f6 Binary files /dev/null and b/public/static/diy/navbtn_open_default.gif differ diff --git a/public/static/diy/navbtn_open_green.gif b/public/static/diy/navbtn_open_green.gif new file mode 100644 index 00000000..2346727a Binary files /dev/null and b/public/static/diy/navbtn_open_green.gif differ diff --git a/public/static/diy/navbtn_open_orange.gif b/public/static/diy/navbtn_open_orange.gif new file mode 100644 index 00000000..93a2333f Binary files /dev/null and b/public/static/diy/navbtn_open_orange.gif differ diff --git a/public/static/diy/navbtn_open_pink.gif b/public/static/diy/navbtn_open_pink.gif new file mode 100644 index 00000000..2fda36e4 Binary files /dev/null and b/public/static/diy/navbtn_open_pink.gif differ diff --git a/public/static/diy/navbtn_open_purple.gif b/public/static/diy/navbtn_open_purple.gif new file mode 100644 index 00000000..2d63fcb6 Binary files /dev/null and b/public/static/diy/navbtn_open_purple.gif differ diff --git a/public/static/diy/order1.png b/public/static/diy/order1.png new file mode 100644 index 00000000..7d21dfc5 Binary files /dev/null and b/public/static/diy/order1.png differ diff --git a/public/static/diy/order1_blue.png b/public/static/diy/order1_blue.png new file mode 100644 index 00000000..10f7640f Binary files /dev/null and b/public/static/diy/order1_blue.png differ diff --git a/public/static/diy/order1_default.png b/public/static/diy/order1_default.png new file mode 100644 index 00000000..b9756425 Binary files /dev/null and b/public/static/diy/order1_default.png differ diff --git a/public/static/diy/order1_green.png b/public/static/diy/order1_green.png new file mode 100644 index 00000000..c4cff8f7 Binary files /dev/null and b/public/static/diy/order1_green.png differ diff --git a/public/static/diy/order1_orange.png b/public/static/diy/order1_orange.png new file mode 100644 index 00000000..f135e472 Binary files /dev/null and b/public/static/diy/order1_orange.png differ diff --git a/public/static/diy/order1_pink.png b/public/static/diy/order1_pink.png new file mode 100644 index 00000000..a4500696 Binary files /dev/null and b/public/static/diy/order1_pink.png differ diff --git a/public/static/diy/order1_purple.png b/public/static/diy/order1_purple.png new file mode 100644 index 00000000..06478f3b Binary files /dev/null and b/public/static/diy/order1_purple.png differ diff --git a/public/static/diy/order2.png b/public/static/diy/order2.png new file mode 100644 index 00000000..d07217ca Binary files /dev/null and b/public/static/diy/order2.png differ diff --git a/public/static/diy/order2_blue.png b/public/static/diy/order2_blue.png new file mode 100644 index 00000000..2e3c7dd5 Binary files /dev/null and b/public/static/diy/order2_blue.png differ diff --git a/public/static/diy/order2_default.png b/public/static/diy/order2_default.png new file mode 100644 index 00000000..26aca4a3 Binary files /dev/null and b/public/static/diy/order2_default.png differ diff --git a/public/static/diy/order2_green.png b/public/static/diy/order2_green.png new file mode 100644 index 00000000..9364dbdf Binary files /dev/null and b/public/static/diy/order2_green.png differ diff --git a/public/static/diy/order2_orange.png b/public/static/diy/order2_orange.png new file mode 100644 index 00000000..7e94fa51 Binary files /dev/null and b/public/static/diy/order2_orange.png differ diff --git a/public/static/diy/order2_pink.png b/public/static/diy/order2_pink.png new file mode 100644 index 00000000..ae34fd48 Binary files /dev/null and b/public/static/diy/order2_pink.png differ diff --git a/public/static/diy/order2_purple.png b/public/static/diy/order2_purple.png new file mode 100644 index 00000000..f4b5a3d7 Binary files /dev/null and b/public/static/diy/order2_purple.png differ diff --git a/public/static/diy/order3.png b/public/static/diy/order3.png new file mode 100644 index 00000000..3265775e Binary files /dev/null and b/public/static/diy/order3.png differ diff --git a/public/static/diy/order3_blue.png b/public/static/diy/order3_blue.png new file mode 100644 index 00000000..ee6b083f Binary files /dev/null and b/public/static/diy/order3_blue.png differ diff --git a/public/static/diy/order3_default.png b/public/static/diy/order3_default.png new file mode 100644 index 00000000..c4db5a98 Binary files /dev/null and b/public/static/diy/order3_default.png differ diff --git a/public/static/diy/order3_green.png b/public/static/diy/order3_green.png new file mode 100644 index 00000000..3e813102 Binary files /dev/null and b/public/static/diy/order3_green.png differ diff --git a/public/static/diy/order3_orange.png b/public/static/diy/order3_orange.png new file mode 100644 index 00000000..5ed0e3ff Binary files /dev/null and b/public/static/diy/order3_orange.png differ diff --git a/public/static/diy/order3_pink.png b/public/static/diy/order3_pink.png new file mode 100644 index 00000000..8ff495d1 Binary files /dev/null and b/public/static/diy/order3_pink.png differ diff --git a/public/static/diy/order3_purple.png b/public/static/diy/order3_purple.png new file mode 100644 index 00000000..81f2ecbb Binary files /dev/null and b/public/static/diy/order3_purple.png differ diff --git a/public/static/diy/order4.png b/public/static/diy/order4.png new file mode 100644 index 00000000..9bc9668d Binary files /dev/null and b/public/static/diy/order4.png differ diff --git a/public/static/diy/order4_blue.png b/public/static/diy/order4_blue.png new file mode 100644 index 00000000..c615b9a4 Binary files /dev/null and b/public/static/diy/order4_blue.png differ diff --git a/public/static/diy/order4_default.png b/public/static/diy/order4_default.png new file mode 100644 index 00000000..64462ec4 Binary files /dev/null and b/public/static/diy/order4_default.png differ diff --git a/public/static/diy/order4_green.png b/public/static/diy/order4_green.png new file mode 100644 index 00000000..a129acc0 Binary files /dev/null and b/public/static/diy/order4_green.png differ diff --git a/public/static/diy/order4_orange.png b/public/static/diy/order4_orange.png new file mode 100644 index 00000000..b070c545 Binary files /dev/null and b/public/static/diy/order4_orange.png differ diff --git a/public/static/diy/order4_pink.png b/public/static/diy/order4_pink.png new file mode 100644 index 00000000..e416bec9 Binary files /dev/null and b/public/static/diy/order4_pink.png differ diff --git a/public/static/diy/order4_purple.png b/public/static/diy/order4_purple.png new file mode 100644 index 00000000..d22d98fa Binary files /dev/null and b/public/static/diy/order4_purple.png differ diff --git a/public/static/diy/order5.png b/public/static/diy/order5.png new file mode 100644 index 00000000..ac58a60a Binary files /dev/null and b/public/static/diy/order5.png differ diff --git a/public/static/diy/order5_blue.png b/public/static/diy/order5_blue.png new file mode 100644 index 00000000..5b3f9e1f Binary files /dev/null and b/public/static/diy/order5_blue.png differ diff --git a/public/static/diy/order5_default.png b/public/static/diy/order5_default.png new file mode 100644 index 00000000..11dd81dd Binary files /dev/null and b/public/static/diy/order5_default.png differ diff --git a/public/static/diy/order5_green.png b/public/static/diy/order5_green.png new file mode 100644 index 00000000..29e4a410 Binary files /dev/null and b/public/static/diy/order5_green.png differ diff --git a/public/static/diy/order5_orange.png b/public/static/diy/order5_orange.png new file mode 100644 index 00000000..ae4575cb Binary files /dev/null and b/public/static/diy/order5_orange.png differ diff --git a/public/static/diy/order5_pink.png b/public/static/diy/order5_pink.png new file mode 100644 index 00000000..e8d12df6 Binary files /dev/null and b/public/static/diy/order5_pink.png differ diff --git a/public/static/diy/order5_purple.png b/public/static/diy/order5_purple.png new file mode 100644 index 00000000..5ed720eb Binary files /dev/null and b/public/static/diy/order5_purple.png differ diff --git a/public/static/diy/pink_btn_blue.png b/public/static/diy/pink_btn_blue.png new file mode 100644 index 00000000..d6b244d0 Binary files /dev/null and b/public/static/diy/pink_btn_blue.png differ diff --git a/public/static/diy/pink_btn_default.png b/public/static/diy/pink_btn_default.png new file mode 100644 index 00000000..6e77a72e Binary files /dev/null and b/public/static/diy/pink_btn_default.png differ diff --git a/public/static/diy/pink_btn_green.png b/public/static/diy/pink_btn_green.png new file mode 100644 index 00000000..3af27f1b Binary files /dev/null and b/public/static/diy/pink_btn_green.png differ diff --git a/public/static/diy/pink_btn_orangr.png b/public/static/diy/pink_btn_orangr.png new file mode 100644 index 00000000..e321dcbb Binary files /dev/null and b/public/static/diy/pink_btn_orangr.png differ diff --git a/public/static/diy/pink_btn_pink.png b/public/static/diy/pink_btn_pink.png new file mode 100644 index 00000000..dc10a524 Binary files /dev/null and b/public/static/diy/pink_btn_pink.png differ diff --git a/public/static/diy/pink_btn_purple.png b/public/static/diy/pink_btn_purple.png new file mode 100644 index 00000000..0836fda4 Binary files /dev/null and b/public/static/diy/pink_btn_purple.png differ diff --git a/public/static/diy/presell_bg_blue.jpg b/public/static/diy/presell_bg_blue.jpg new file mode 100644 index 00000000..a52015bd Binary files /dev/null and b/public/static/diy/presell_bg_blue.jpg differ diff --git a/public/static/diy/presell_bg_default.jpg b/public/static/diy/presell_bg_default.jpg new file mode 100644 index 00000000..d2675c6a Binary files /dev/null and b/public/static/diy/presell_bg_default.jpg differ diff --git a/public/static/diy/presell_bg_green.jpg b/public/static/diy/presell_bg_green.jpg new file mode 100644 index 00000000..ea0211fe Binary files /dev/null and b/public/static/diy/presell_bg_green.jpg differ diff --git a/public/static/diy/presell_bg_orange.jpg b/public/static/diy/presell_bg_orange.jpg new file mode 100644 index 00000000..ae6e0332 Binary files /dev/null and b/public/static/diy/presell_bg_orange.jpg differ diff --git a/public/static/diy/presell_bg_pink.jpg b/public/static/diy/presell_bg_pink.jpg new file mode 100644 index 00000000..1ddbdb52 Binary files /dev/null and b/public/static/diy/presell_bg_pink.jpg differ diff --git a/public/static/diy/presell_bg_purple.jpg b/public/static/diy/presell_bg_purple.jpg new file mode 100644 index 00000000..b5441a56 Binary files /dev/null and b/public/static/diy/presell_bg_purple.jpg differ diff --git a/public/static/diy/presell_title_blue.png b/public/static/diy/presell_title_blue.png new file mode 100644 index 00000000..23e8ed92 Binary files /dev/null and b/public/static/diy/presell_title_blue.png differ diff --git a/public/static/diy/presell_title_default.png b/public/static/diy/presell_title_default.png new file mode 100644 index 00000000..0059b620 Binary files /dev/null and b/public/static/diy/presell_title_default.png differ diff --git a/public/static/diy/presell_title_green.png b/public/static/diy/presell_title_green.png new file mode 100644 index 00000000..d84e3f93 Binary files /dev/null and b/public/static/diy/presell_title_green.png differ diff --git a/public/static/diy/presell_title_orange.png b/public/static/diy/presell_title_orange.png new file mode 100644 index 00000000..0badced7 Binary files /dev/null and b/public/static/diy/presell_title_orange.png differ diff --git a/public/static/diy/presell_title_pink.png b/public/static/diy/presell_title_pink.png new file mode 100644 index 00000000..894bdd6f Binary files /dev/null and b/public/static/diy/presell_title_pink.png differ diff --git a/public/static/diy/presell_title_purple.png b/public/static/diy/presell_title_purple.png new file mode 100644 index 00000000..f950a376 Binary files /dev/null and b/public/static/diy/presell_title_purple.png differ diff --git a/public/static/diy/priceBg_blue.png b/public/static/diy/priceBg_blue.png new file mode 100644 index 00000000..c689b2bc Binary files /dev/null and b/public/static/diy/priceBg_blue.png differ diff --git a/public/static/diy/priceBg_default.png b/public/static/diy/priceBg_default.png new file mode 100644 index 00000000..a9f38188 Binary files /dev/null and b/public/static/diy/priceBg_default.png differ diff --git a/public/static/diy/priceBg_green.png b/public/static/diy/priceBg_green.png new file mode 100644 index 00000000..264074e9 Binary files /dev/null and b/public/static/diy/priceBg_green.png differ diff --git a/public/static/diy/priceBg_orange.png b/public/static/diy/priceBg_orange.png new file mode 100644 index 00000000..66d388d1 Binary files /dev/null and b/public/static/diy/priceBg_orange.png differ diff --git a/public/static/diy/priceBg_pink.png b/public/static/diy/priceBg_pink.png new file mode 100644 index 00000000..b3ca35b6 Binary files /dev/null and b/public/static/diy/priceBg_pink.png differ diff --git a/public/static/diy/priceBg_purple.png b/public/static/diy/priceBg_purple.png new file mode 100644 index 00000000..95403e7b Binary files /dev/null and b/public/static/diy/priceBg_purple.png differ diff --git a/public/static/diy/priceTag_blue.png b/public/static/diy/priceTag_blue.png new file mode 100644 index 00000000..172fcc53 Binary files /dev/null and b/public/static/diy/priceTag_blue.png differ diff --git a/public/static/diy/priceTag_default.png b/public/static/diy/priceTag_default.png new file mode 100644 index 00000000..f89c04de Binary files /dev/null and b/public/static/diy/priceTag_default.png differ diff --git a/public/static/diy/priceTag_green.png b/public/static/diy/priceTag_green.png new file mode 100644 index 00000000..e5e2141e Binary files /dev/null and b/public/static/diy/priceTag_green.png differ diff --git a/public/static/diy/priceTag_orange.png b/public/static/diy/priceTag_orange.png new file mode 100644 index 00000000..50ffd0e5 Binary files /dev/null and b/public/static/diy/priceTag_orange.png differ diff --git a/public/static/diy/priceTag_pink.png b/public/static/diy/priceTag_pink.png new file mode 100644 index 00000000..8b2fa157 Binary files /dev/null and b/public/static/diy/priceTag_pink.png differ diff --git a/public/static/diy/priceTag_purple.png b/public/static/diy/priceTag_purple.png new file mode 100644 index 00000000..2edf0d2e Binary files /dev/null and b/public/static/diy/priceTag_purple.png differ diff --git a/public/static/diy/recommend_cate_blue.png b/public/static/diy/recommend_cate_blue.png new file mode 100644 index 00000000..7708c94e Binary files /dev/null and b/public/static/diy/recommend_cate_blue.png differ diff --git a/public/static/diy/recommend_cate_default.png b/public/static/diy/recommend_cate_default.png new file mode 100644 index 00000000..e4baa4a2 Binary files /dev/null and b/public/static/diy/recommend_cate_default.png differ diff --git a/public/static/diy/recommend_cate_green.png b/public/static/diy/recommend_cate_green.png new file mode 100644 index 00000000..ac5522e3 Binary files /dev/null and b/public/static/diy/recommend_cate_green.png differ diff --git a/public/static/diy/recommend_cate_orange.png b/public/static/diy/recommend_cate_orange.png new file mode 100644 index 00000000..be88f9cf Binary files /dev/null and b/public/static/diy/recommend_cate_orange.png differ diff --git a/public/static/diy/recommend_cate_pink.png b/public/static/diy/recommend_cate_pink.png new file mode 100644 index 00000000..d0569b60 Binary files /dev/null and b/public/static/diy/recommend_cate_pink.png differ diff --git a/public/static/diy/recommend_cate_purple.png b/public/static/diy/recommend_cate_purple.png new file mode 100644 index 00000000..4d556aa0 Binary files /dev/null and b/public/static/diy/recommend_cate_purple.png differ diff --git a/public/static/diy/record1_blue.png b/public/static/diy/record1_blue.png new file mode 100644 index 00000000..a0be964c Binary files /dev/null and b/public/static/diy/record1_blue.png differ diff --git a/public/static/diy/record1_default.png b/public/static/diy/record1_default.png new file mode 100644 index 00000000..ad59b4c9 Binary files /dev/null and b/public/static/diy/record1_default.png differ diff --git a/public/static/diy/record1_green.png b/public/static/diy/record1_green.png new file mode 100644 index 00000000..b6dc77e2 Binary files /dev/null and b/public/static/diy/record1_green.png differ diff --git a/public/static/diy/record1_orange.png b/public/static/diy/record1_orange.png new file mode 100644 index 00000000..3891924a Binary files /dev/null and b/public/static/diy/record1_orange.png differ diff --git a/public/static/diy/record1_pink.png b/public/static/diy/record1_pink.png new file mode 100644 index 00000000..dfc6ef67 Binary files /dev/null and b/public/static/diy/record1_pink.png differ diff --git a/public/static/diy/record1_purple.png b/public/static/diy/record1_purple.png new file mode 100644 index 00000000..bc5307d4 Binary files /dev/null and b/public/static/diy/record1_purple.png differ diff --git a/public/static/diy/record2_blue.png b/public/static/diy/record2_blue.png new file mode 100644 index 00000000..6eefa8fa Binary files /dev/null and b/public/static/diy/record2_blue.png differ diff --git a/public/static/diy/record2_default.png b/public/static/diy/record2_default.png new file mode 100644 index 00000000..be87f1ee Binary files /dev/null and b/public/static/diy/record2_default.png differ diff --git a/public/static/diy/record2_green.png b/public/static/diy/record2_green.png new file mode 100644 index 00000000..0c160afd Binary files /dev/null and b/public/static/diy/record2_green.png differ diff --git a/public/static/diy/record2_orange.png b/public/static/diy/record2_orange.png new file mode 100644 index 00000000..19d15a41 Binary files /dev/null and b/public/static/diy/record2_orange.png differ diff --git a/public/static/diy/record2_pink.png b/public/static/diy/record2_pink.png new file mode 100644 index 00000000..6ba4f2ee Binary files /dev/null and b/public/static/diy/record2_pink.png differ diff --git a/public/static/diy/record2_purple.png b/public/static/diy/record2_purple.png new file mode 100644 index 00000000..042ee9cd Binary files /dev/null and b/public/static/diy/record2_purple.png differ diff --git a/public/static/diy/record3_blue.png b/public/static/diy/record3_blue.png new file mode 100644 index 00000000..dd2f9795 Binary files /dev/null and b/public/static/diy/record3_blue.png differ diff --git a/public/static/diy/record3_default.png b/public/static/diy/record3_default.png new file mode 100644 index 00000000..6b96d629 Binary files /dev/null and b/public/static/diy/record3_default.png differ diff --git a/public/static/diy/record3_green.png b/public/static/diy/record3_green.png new file mode 100644 index 00000000..03588bca Binary files /dev/null and b/public/static/diy/record3_green.png differ diff --git a/public/static/diy/record3_orange.png b/public/static/diy/record3_orange.png new file mode 100644 index 00000000..6ab1990b Binary files /dev/null and b/public/static/diy/record3_orange.png differ diff --git a/public/static/diy/record3_pink.png b/public/static/diy/record3_pink.png new file mode 100644 index 00000000..909eaf52 Binary files /dev/null and b/public/static/diy/record3_pink.png differ diff --git a/public/static/diy/record3_purple.png b/public/static/diy/record3_purple.png new file mode 100644 index 00000000..c50f9711 Binary files /dev/null and b/public/static/diy/record3_purple.png differ diff --git a/public/static/diy/record4_blue.png b/public/static/diy/record4_blue.png new file mode 100644 index 00000000..7e8695f8 Binary files /dev/null and b/public/static/diy/record4_blue.png differ diff --git a/public/static/diy/record4_default.png b/public/static/diy/record4_default.png new file mode 100644 index 00000000..233ed86f Binary files /dev/null and b/public/static/diy/record4_default.png differ diff --git a/public/static/diy/record4_green.png b/public/static/diy/record4_green.png new file mode 100644 index 00000000..1a3ee9cb Binary files /dev/null and b/public/static/diy/record4_green.png differ diff --git a/public/static/diy/record4_orange.png b/public/static/diy/record4_orange.png new file mode 100644 index 00000000..f7ca7748 Binary files /dev/null and b/public/static/diy/record4_orange.png differ diff --git a/public/static/diy/record4_pink.png b/public/static/diy/record4_pink.png new file mode 100644 index 00000000..975bea1d Binary files /dev/null and b/public/static/diy/record4_pink.png differ diff --git a/public/static/diy/record4_purple.png b/public/static/diy/record4_purple.png new file mode 100644 index 00000000..61a4ba72 Binary files /dev/null and b/public/static/diy/record4_purple.png differ diff --git a/public/static/diy/score1_blue.png b/public/static/diy/score1_blue.png new file mode 100644 index 00000000..5113acad Binary files /dev/null and b/public/static/diy/score1_blue.png differ diff --git a/public/static/diy/score1_default.png b/public/static/diy/score1_default.png new file mode 100644 index 00000000..ab6f6bb3 Binary files /dev/null and b/public/static/diy/score1_default.png differ diff --git a/public/static/diy/score1_green.png b/public/static/diy/score1_green.png new file mode 100644 index 00000000..4fb7aa8b Binary files /dev/null and b/public/static/diy/score1_green.png differ diff --git a/public/static/diy/score1_orange.png b/public/static/diy/score1_orange.png new file mode 100644 index 00000000..470f3e80 Binary files /dev/null and b/public/static/diy/score1_orange.png differ diff --git a/public/static/diy/score1_pink.png b/public/static/diy/score1_pink.png new file mode 100644 index 00000000..9fb3b523 Binary files /dev/null and b/public/static/diy/score1_pink.png differ diff --git a/public/static/diy/score1_purple.png b/public/static/diy/score1_purple.png new file mode 100644 index 00000000..5113acad Binary files /dev/null and b/public/static/diy/score1_purple.png differ diff --git a/public/static/diy/score2_blue.png b/public/static/diy/score2_blue.png new file mode 100644 index 00000000..bc1fd2a2 Binary files /dev/null and b/public/static/diy/score2_blue.png differ diff --git a/public/static/diy/score2_default.png b/public/static/diy/score2_default.png new file mode 100644 index 00000000..0bc7d5c4 Binary files /dev/null and b/public/static/diy/score2_default.png differ diff --git a/public/static/diy/score2_green.png b/public/static/diy/score2_green.png new file mode 100644 index 00000000..dd665b58 Binary files /dev/null and b/public/static/diy/score2_green.png differ diff --git a/public/static/diy/score2_orange.png b/public/static/diy/score2_orange.png new file mode 100644 index 00000000..3e3e929f Binary files /dev/null and b/public/static/diy/score2_orange.png differ diff --git a/public/static/diy/score2_pink.png b/public/static/diy/score2_pink.png new file mode 100644 index 00000000..cf20ed8d Binary files /dev/null and b/public/static/diy/score2_pink.png differ diff --git a/public/static/diy/score2_purple.png b/public/static/diy/score2_purple.png new file mode 100644 index 00000000..f88c8fcf Binary files /dev/null and b/public/static/diy/score2_purple.png differ diff --git a/public/static/diy/select01_blue.png b/public/static/diy/select01_blue.png new file mode 100644 index 00000000..46c5b39c Binary files /dev/null and b/public/static/diy/select01_blue.png differ diff --git a/public/static/diy/select01_default.png b/public/static/diy/select01_default.png new file mode 100644 index 00000000..420726d7 Binary files /dev/null and b/public/static/diy/select01_default.png differ diff --git a/public/static/diy/select01_green.png b/public/static/diy/select01_green.png new file mode 100644 index 00000000..281e6a45 Binary files /dev/null and b/public/static/diy/select01_green.png differ diff --git a/public/static/diy/select01_orange.png b/public/static/diy/select01_orange.png new file mode 100644 index 00000000..b051b9e0 Binary files /dev/null and b/public/static/diy/select01_orange.png differ diff --git a/public/static/diy/select01_pink.png b/public/static/diy/select01_pink.png new file mode 100644 index 00000000..f2f6f0a8 Binary files /dev/null and b/public/static/diy/select01_pink.png differ diff --git a/public/static/diy/select01_purple.png b/public/static/diy/select01_purple.png new file mode 100644 index 00000000..f393f18e Binary files /dev/null and b/public/static/diy/select01_purple.png differ diff --git a/public/static/diy/select02_blue.png b/public/static/diy/select02_blue.png new file mode 100644 index 00000000..f04b571e Binary files /dev/null and b/public/static/diy/select02_blue.png differ diff --git a/public/static/diy/select02_default.png b/public/static/diy/select02_default.png new file mode 100644 index 00000000..3cfb1cce Binary files /dev/null and b/public/static/diy/select02_default.png differ diff --git a/public/static/diy/select02_green.png b/public/static/diy/select02_green.png new file mode 100644 index 00000000..85c1f61a Binary files /dev/null and b/public/static/diy/select02_green.png differ diff --git a/public/static/diy/select02_orange.png b/public/static/diy/select02_orange.png new file mode 100644 index 00000000..15155e0b Binary files /dev/null and b/public/static/diy/select02_orange.png differ diff --git a/public/static/diy/select02_pink.png b/public/static/diy/select02_pink.png new file mode 100644 index 00000000..dd8629f8 Binary files /dev/null and b/public/static/diy/select02_pink.png differ diff --git a/public/static/diy/select02_purple.png b/public/static/diy/select02_purple.png new file mode 100644 index 00000000..3d281a87 Binary files /dev/null and b/public/static/diy/select02_purple.png differ diff --git a/public/static/diy/selection_blue.jpg b/public/static/diy/selection_blue.jpg new file mode 100644 index 00000000..94a938af Binary files /dev/null and b/public/static/diy/selection_blue.jpg differ diff --git a/public/static/diy/selection_default.jpg b/public/static/diy/selection_default.jpg new file mode 100644 index 00000000..11514cd8 Binary files /dev/null and b/public/static/diy/selection_default.jpg differ diff --git a/public/static/diy/selection_green.jpg b/public/static/diy/selection_green.jpg new file mode 100644 index 00000000..25aa5bc5 Binary files /dev/null and b/public/static/diy/selection_green.jpg differ diff --git a/public/static/diy/selection_orange.jpg b/public/static/diy/selection_orange.jpg new file mode 100644 index 00000000..9df1d7d7 Binary files /dev/null and b/public/static/diy/selection_orange.jpg differ diff --git a/public/static/diy/selection_pink.jpg b/public/static/diy/selection_pink.jpg new file mode 100644 index 00000000..2501ff4b Binary files /dev/null and b/public/static/diy/selection_pink.jpg differ diff --git a/public/static/diy/selection_purple.jpg b/public/static/diy/selection_purple.jpg new file mode 100644 index 00000000..9841c4d3 Binary files /dev/null and b/public/static/diy/selection_purple.jpg differ diff --git a/public/static/diy/signSuccess_blue.png b/public/static/diy/signSuccess_blue.png new file mode 100644 index 00000000..28dfc4c6 Binary files /dev/null and b/public/static/diy/signSuccess_blue.png differ diff --git a/public/static/diy/signSuccess_default.png b/public/static/diy/signSuccess_default.png new file mode 100644 index 00000000..47178433 Binary files /dev/null and b/public/static/diy/signSuccess_default.png differ diff --git a/public/static/diy/signSuccess_green.png b/public/static/diy/signSuccess_green.png new file mode 100644 index 00000000..03370bea Binary files /dev/null and b/public/static/diy/signSuccess_green.png differ diff --git a/public/static/diy/signSuccess_orange.png b/public/static/diy/signSuccess_orange.png new file mode 100644 index 00000000..9e00ed4d Binary files /dev/null and b/public/static/diy/signSuccess_orange.png differ diff --git a/public/static/diy/signSuccess_pink.png b/public/static/diy/signSuccess_pink.png new file mode 100644 index 00000000..11934ba5 Binary files /dev/null and b/public/static/diy/signSuccess_pink.png differ diff --git a/public/static/diy/signSuccess_purple.png b/public/static/diy/signSuccess_purple.png new file mode 100644 index 00000000..5dc4b4fc Binary files /dev/null and b/public/static/diy/signSuccess_purple.png differ diff --git a/public/static/diy/sort1_blue.png b/public/static/diy/sort1_blue.png new file mode 100644 index 00000000..9923ec1c Binary files /dev/null and b/public/static/diy/sort1_blue.png differ diff --git a/public/static/diy/sort1_default.png b/public/static/diy/sort1_default.png new file mode 100644 index 00000000..dcafa4e1 Binary files /dev/null and b/public/static/diy/sort1_default.png differ diff --git a/public/static/diy/sort1_green.png b/public/static/diy/sort1_green.png new file mode 100644 index 00000000..cf6e6511 Binary files /dev/null and b/public/static/diy/sort1_green.png differ diff --git a/public/static/diy/sort1_orange.png b/public/static/diy/sort1_orange.png new file mode 100644 index 00000000..2634cf2c Binary files /dev/null and b/public/static/diy/sort1_orange.png differ diff --git a/public/static/diy/sort1_pink.png b/public/static/diy/sort1_pink.png new file mode 100644 index 00000000..f7c96917 Binary files /dev/null and b/public/static/diy/sort1_pink.png differ diff --git a/public/static/diy/sort1_purple.png b/public/static/diy/sort1_purple.png new file mode 100644 index 00000000..de9dd027 Binary files /dev/null and b/public/static/diy/sort1_purple.png differ diff --git a/public/static/diy/sort3_blue.png b/public/static/diy/sort3_blue.png new file mode 100644 index 00000000..08da296b Binary files /dev/null and b/public/static/diy/sort3_blue.png differ diff --git a/public/static/diy/sort3_default.png b/public/static/diy/sort3_default.png new file mode 100644 index 00000000..7a66dfd3 Binary files /dev/null and b/public/static/diy/sort3_default.png differ diff --git a/public/static/diy/sort3_green.png b/public/static/diy/sort3_green.png new file mode 100644 index 00000000..4641b536 Binary files /dev/null and b/public/static/diy/sort3_green.png differ diff --git a/public/static/diy/sort3_orange.png b/public/static/diy/sort3_orange.png new file mode 100644 index 00000000..5384db4f Binary files /dev/null and b/public/static/diy/sort3_orange.png differ diff --git a/public/static/diy/sort3_pink.png b/public/static/diy/sort3_pink.png new file mode 100644 index 00000000..982958f6 Binary files /dev/null and b/public/static/diy/sort3_pink.png differ diff --git a/public/static/diy/sort3_purple.png b/public/static/diy/sort3_purple.png new file mode 100644 index 00000000..9ed41842 Binary files /dev/null and b/public/static/diy/sort3_purple.png differ diff --git a/public/static/diy/store_bg_blue.png b/public/static/diy/store_bg_blue.png new file mode 100644 index 00000000..7eb9324d Binary files /dev/null and b/public/static/diy/store_bg_blue.png differ diff --git a/public/static/diy/store_bg_default.png b/public/static/diy/store_bg_default.png new file mode 100644 index 00000000..24e9b50d Binary files /dev/null and b/public/static/diy/store_bg_default.png differ diff --git a/public/static/diy/store_bg_green.png b/public/static/diy/store_bg_green.png new file mode 100644 index 00000000..07988eb8 Binary files /dev/null and b/public/static/diy/store_bg_green.png differ diff --git a/public/static/diy/store_bg_orange.png b/public/static/diy/store_bg_orange.png new file mode 100644 index 00000000..f64c2b6a Binary files /dev/null and b/public/static/diy/store_bg_orange.png differ diff --git a/public/static/diy/store_bg_pink.png b/public/static/diy/store_bg_pink.png new file mode 100644 index 00000000..597ab0cc Binary files /dev/null and b/public/static/diy/store_bg_pink.png differ diff --git a/public/static/diy/store_bg_purple.png b/public/static/diy/store_bg_purple.png new file mode 100644 index 00000000..00e6b879 Binary files /dev/null and b/public/static/diy/store_bg_purple.png differ diff --git a/public/static/diy/success_blue.png b/public/static/diy/success_blue.png new file mode 100644 index 00000000..ad9a1ac7 Binary files /dev/null and b/public/static/diy/success_blue.png differ diff --git a/public/static/diy/success_default.png b/public/static/diy/success_default.png new file mode 100644 index 00000000..41884bbf Binary files /dev/null and b/public/static/diy/success_default.png differ diff --git a/public/static/diy/success_green.png b/public/static/diy/success_green.png new file mode 100644 index 00000000..de4f89b6 Binary files /dev/null and b/public/static/diy/success_green.png differ diff --git a/public/static/diy/success_orange.png b/public/static/diy/success_orange.png new file mode 100644 index 00000000..d4b680b2 Binary files /dev/null and b/public/static/diy/success_orange.png differ diff --git a/public/static/diy/success_pink.png b/public/static/diy/success_pink.png new file mode 100644 index 00000000..ff86bcd3 Binary files /dev/null and b/public/static/diy/success_pink.png differ diff --git a/public/static/diy/success_purple.png b/public/static/diy/success_purple.png new file mode 100644 index 00000000..47a03ae8 Binary files /dev/null and b/public/static/diy/success_purple.png differ diff --git a/public/static/diy/up_blue.png b/public/static/diy/up_blue.png new file mode 100644 index 00000000..266a9f80 Binary files /dev/null and b/public/static/diy/up_blue.png differ diff --git a/public/static/diy/up_default.png b/public/static/diy/up_default.png new file mode 100644 index 00000000..fc535c8d Binary files /dev/null and b/public/static/diy/up_default.png differ diff --git a/public/static/diy/up_green.png b/public/static/diy/up_green.png new file mode 100644 index 00000000..6c66af8c Binary files /dev/null and b/public/static/diy/up_green.png differ diff --git a/public/static/diy/up_orange.png b/public/static/diy/up_orange.png new file mode 100644 index 00000000..8ca93559 Binary files /dev/null and b/public/static/diy/up_orange.png differ diff --git a/public/static/diy/up_pink.png b/public/static/diy/up_pink.png new file mode 100644 index 00000000..cf2eee2b Binary files /dev/null and b/public/static/diy/up_pink.png differ diff --git a/public/static/diy/up_purple.png b/public/static/diy/up_purple.png new file mode 100644 index 00000000..f4017b33 Binary files /dev/null and b/public/static/diy/up_purple.png differ diff --git a/public/static/diy/user_bg_blue.png b/public/static/diy/user_bg_blue.png new file mode 100644 index 00000000..a67d4fc1 Binary files /dev/null and b/public/static/diy/user_bg_blue.png differ diff --git a/public/static/diy/user_bg_default.png b/public/static/diy/user_bg_default.png new file mode 100644 index 00000000..7ded5086 Binary files /dev/null and b/public/static/diy/user_bg_default.png differ diff --git a/public/static/diy/user_bg_green.png b/public/static/diy/user_bg_green.png new file mode 100644 index 00000000..a7ec64c8 Binary files /dev/null and b/public/static/diy/user_bg_green.png differ diff --git a/public/static/diy/user_bg_orange.png b/public/static/diy/user_bg_orange.png new file mode 100644 index 00000000..94081750 Binary files /dev/null and b/public/static/diy/user_bg_orange.png differ diff --git a/public/static/diy/user_bg_pink.png b/public/static/diy/user_bg_pink.png new file mode 100644 index 00000000..dc2f31fb Binary files /dev/null and b/public/static/diy/user_bg_pink.png differ diff --git a/public/static/diy/user_bg_purple.png b/public/static/diy/user_bg_purple.png new file mode 100644 index 00000000..58c01ffa Binary files /dev/null and b/public/static/diy/user_bg_purple.png differ