From fa48f277166a2499a88194e327b9fab1c26de76c Mon Sep 17 00:00:00 2001
From: fox <1466778434@qq.com>
Date: Thu, 20 Mar 2025 21:52:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2(?=
 =?UTF-8?q?=E6=9A=82=E5=AD=98);?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/product/productCard.vue              |  10 +-
 pages_order/order/createOrder.vue               | 230 +++++++++++-------------
 pages_order/product/productDetail.vue           |   5 +-
 pages_order/static/createOrder/account.png      | Bin 839 -> 0 bytes
 pages_order/static/createOrder/coupon.png       | Bin 1485 -> 0 bytes
 pages_order/static/createOrder/icon-account.png | Bin 0 -> 896 bytes
 pages_order/static/createOrder/icon-coupon.png  | Bin 0 -> 1815 bytes
 pages_order/static/createOrder/icon-wx.png      | Bin 0 -> 1795 bytes
 pages_order/static/createOrder/wx.png           | Bin 2302 -> 0 bytes
 9 files changed, 121 insertions(+), 124 deletions(-)
 delete mode 100644 pages_order/static/createOrder/account.png
 delete mode 100644 pages_order/static/createOrder/coupon.png
 create mode 100644 pages_order/static/createOrder/icon-account.png
 create mode 100644 pages_order/static/createOrder/icon-coupon.png
 create mode 100644 pages_order/static/createOrder/icon-wx.png
 delete mode 100644 pages_order/static/createOrder/wx.png

diff --git a/components/product/productCard.vue b/components/product/productCard.vue
index 9717744..126c6e9 100644
--- a/components/product/productCard.vue
+++ b/components/product/productCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="card flex product" :class="[direction]" @click="$emit('click')">
+  <view class="card flex product product-card__view" :class="[direction]" @click="$emit('click')">
     <view class="img" :class="[ data.isRecommend ? 'is-recommend' : '']">
       <image :src="data.imgUrl" mode="aspectFill"></image>
       <image v-if="data.isRecommend" class="mark" src="@/static/image/home/mark-recommend.png"></image>
@@ -29,7 +29,9 @@
           <text>{{ `已售出 ${data.sales}单` }}</text>
         </view>
       </view>
-      <button plain class="btn" @click="goToPlaceOrder(data.id)">立即下单</button>
+      <template v-if="!readonly">
+        <button plain class="btn" @click="goToPlaceOrder(data.id)">立即下单</button>
+      </template>
     </view>
   </view>
 </template>
@@ -56,6 +58,10 @@
       direction: {
         type: String,
         default: 'horizontal' // horizontal | vertical
+      },
+      readonly: {
+        type: Boolean,
+        default: false,
       }
     },
 		data() {
diff --git a/pages_order/order/createOrder.vue b/pages_order/order/createOrder.vue
index 42bf126..37f5666 100644
--- a/pages_order/order/createOrder.vue
+++ b/pages_order/order/createOrder.vue
@@ -1,66 +1,13 @@
 <template>
 	<view class="page">
 		<!-- 导航栏 -->
-		<navbar :title="titleMap[type]" leftClick @leftClick="$utils.navigateBack" bgColor="#E3441A" color="#fff" />
+		<navbar title="商品支付" leftClick @leftClick="$utils.navigateBack" color="#fff" />
 
-		<view class="bac"></view>
-
-		<view class="box">
-			
-			<!-- 送礼 -->
-			<view class="give-type" v-if="type == 'give'">
-				<view class="tab-box">
-					<view class="tab-item" :class="{'active': isGive === 1}" 
-                    @click="isGive = 1">
-						<text>单人礼包</text>
-						<text class="desc">送给1位好友，可同时送多件礼品</text>
-					</view>
-					<view class="tab-item" :class="{'active': isGive === 2}" 
-                    @click="isGive = 2">
-						<text>多人礼包</text>
-						<text class="desc">送给多位好友，每人1件礼品</text>
-					</view>
-					<view class="tab-item" :class="{'active': isGive === 3}" 
-                    @click="isGive = 3">
-						<text>抽奖礼包</text>
-						<text class="desc">好友抽奖，中奖者获得礼品</text>
-					</view>
-				</view>
-				<!-- <view class="tips">
-					<text>支付后分享给好友收礼</text>
-					<text class="guide" @click="$refs.popup.open('gift_guide')">指南</text>
-				</view> -->
-			</view>
-
-            <!-- 多人礼包人数 -->
-            <view class="cell-item" v-if="type == 'give' && isGive === 2">
-                <view class="cell-item-left">
-                    <uv-icon name="gift" size="40" color="#E3441A"></uv-icon>
-                    <view class="user-name">礼包份数</view>
-                </view>
-                <view class="cell-item-right">
-                    <view class="stepper">
-                        <text class="minus" :class="{disabled: multiNum <= multiMinNum}" 
-                            @click="multiNum > multiMinNum && multiNum--">-</text>
-                        <text class="num">{{multiNum}}</text>
-                        <text class="plus" :class="{disabled: multiNum >= multiMaxNum}"
-                            @click="multiNum < multiMaxNum && multiNum++">+</text>
-                    </view>
-                </view>
-            </view>
-
-            <!-- 抽奖礼包说明 -->
-            <view class="lucky-box" v-if="type == 'give' && isGive === 3">
-                <view class="title">抽奖规则</view>
-                <view class="tips-list">
-                    <view class="tip-item">• 好友参与抽奖</view>
-                    <view class="tip-item">• 系统随机抽取中奖者</view>
-                    <view class="tip-item">• 中奖者填写地址领取礼品</view>
-                </view>
-            </view>
+		<view class="content">
 
 			<!-- 商品详情 -->
-			<view class="product-item" v-for="item in payOrderProduct" :key="item.id">
+			<productCard :data="payOrderProduct[0]" :readonly="true"></productCard>
+			<!-- <view class="product-item" v-for="item in payOrderProduct" :key="item.id">
 				<view class="img-box">
 					<image :src="item.image" mode="aspectFill"></image>
 				</view>
@@ -80,58 +27,26 @@
 						<view class="desc">已售出 {{ item.payNum }}单</view>
 					</view>
 				</view>
-			</view>
-
-			<!-- 地址 -->
-			<view @click="openAddress" class="cell-item">
-				<view class="cell-item-left">
-					<image src="@/pages_order/static/createOrder/address.png" mode="widthFix" class="cell-icon"></image>
-					<view class="user-name">{{ address.name }}</view>
-					<view class="user-address">{{ address.address }}</view>
-				</view>
-				<view class="cell-item-right">
-					<uv-icon name="arrow-right"></uv-icon>
-				</view>
-			</view>
+			</view> -->
 
-			<view class="cell-list">
+			<view class="card payment">
 				<uv-radio-group v-model="payMethod">
-					<view style="width: 710rpx;">
-						<!-- 账户余额 -->
-						<view class="cell-item">
-							<view class="cell-item-left">
-								<image src="@/pages_order/static/createOrder/account.png" mode="widthFix" class="cell-icon">
-								</image>
-								<view class="user-name">账户余额</view>
-								<view class="descript">(余额: {{ riceInfo.balance }})</view>
-							</view>
-							<view class="cell-item-right">
-								<uv-radio activeColor="#E3441A"
-								size="40rpx"
-								icon-size="30rpx"
-								:name="1"/>
-							</view>
-						</view>
-						
-						<!-- 微信支付 -->
-						<view class="cell-item">
-							<view class="cell-item-left">
-								<image src="@/pages_order/static/createOrder/wx.png" mode="widthFix" class="cell-icon">
-								</image>
-								<view class="user-name">微信支付</view>
-								<view class="descript"></view>
-							</view>
-							<view class="cell-item-right">
-								<uv-radio 
-								activeColor="#E3441A"
-								size="40rpx"
-								icon-size="30rpx"
-								:name="0"/>
-							</view>
-						</view>
+					<view class="flex payment-item">
+						<image class="icon" src="../static/createOrder/icon-wx.png" mode="widthFix"></image>
+						<text class="label">微信支付</text>
+						<uv-radio :name="0" activeColor="#84A73F" size="39rpx" icon-size="39rpx"/>
+					</view>
+					<view class="flex payment-item">
+						<image class="icon" src="../static/createOrder/icon-account.png" mode="widthFix"></image>
+						<text class="label">账户余额<text class="desc">{{ `（余额:￥${riceInfo.balance || 0}）` }}</text></text>
+						<uv-radio :name="1" activeColor="#84A73F" size="39rpx" icon-size="39rpx"/>
 					</view>
 				</uv-radio-group>
 			</view>
+			
+		</view>
+
+		<template v-if="false">
 
 			<!-- 优惠券 -->
 			<view @click="openCoupon" class="cell-item">
@@ -170,15 +85,8 @@
 					立即支付
 				</view>
 			</view>
-		</view>
 
-		<!-- 地址选择 -->
-		<uv-popup ref="addressPopup" :round="30" style="padding-bottom: 90rpx;">
-			<addressList ref="addressList" height="60vh" @select="selectAddress" />
-			<view class="add-btn">
-				<view @click="$utils.navigateTo('/pages_order/mine/address')" class="button-submit">新增地址</view>
-			</view>
-		</uv-popup>
+		</template>
 
 		<!-- 优惠券选择-->
 		<uv-popup ref="couponPopup" :round="30">
@@ -191,6 +99,8 @@
 </template>
 
 <script>
+	import productCard from '@/components/product/productCard.vue'
+
 	import addressList from '../components/address/addressList.vue'
 	import couponList from '@/components/couponList/couponList.vue'
 
@@ -200,6 +110,8 @@
 
 	export default {
 		components: {
+			productCard,
+
 			addressList,
 			couponList
 		},
@@ -215,15 +127,15 @@
 				agreement: false,
 				coupon: {},
 				payMethod : 0,
-                isGive : 0,
-                type : '',
-                titleMap : {
-                    def : '确认订单',
-                    give : '送礼清单',
-                },
-                multiNum: 2, // 多人礼包人数
-                multiMinNum: 2, // 最小人数
-                multiMaxNum: 100, // 最大人数
+				isGive : 0,
+				type : '',
+				titleMap : {
+						def : '确认订单',
+						give : '送礼清单',
+				},
+				multiNum: 2, // 多人礼包人数
+				multiMinNum: 2, // 最小人数
+				multiMaxNum: 100, // 最大人数
 			}
 		},
 		computed: {
@@ -250,6 +162,8 @@
 			this.$store.commit('getUserInfo')
 		},
 		onShow() {
+			// todo
+			return
 			this.getAddressList()
 			this.getCouponList()
 		},
@@ -427,6 +341,49 @@
 	.page {
 		overflow: auto;
 		padding-bottom: 300rpx;
+		
+		/deep/ .nav-bar__view {
+			padding-bottom: 190rpx;
+			background-image: linear-gradient(#84A73F, #D8FF8F);
+		}
+
+		.content {
+			position: absolute;
+			z-index: 999;
+
+			transform: translateY(-118rpx);
+		
+			width: 100vw;
+			padding: 0 13rpx;
+			box-sizing: border-box;
+		}
+
+		/deep/ .product-card__view {
+			// margin: 0 13rpx;
+			padding: 27rpx 25rpx;
+			// width: calc(100vw - 13rpx*2);
+			width: 100%;
+			box-sizing: border-box;
+			// transform: translateY(-50%);
+
+			.img {
+				width: 184rpx;
+				height: 184rpx;
+			}
+
+			.title {
+				margin-bottom: 14rpx;
+			}
+
+			.price {
+				margin-top: 15rpx;
+			}
+
+			.sales {
+				margin-top: 15rpx;
+			}
+		}
+
 		.bac {
 			width: 100%;
 			height: 100px;
@@ -772,4 +729,35 @@
             }
         }
 	}
+
+	
+
+	.payment {
+		margin-top: 23rpx;
+		padding: 22rpx 42rpx 34rpx 41rpx;
+		color: #000000;
+		font-size: 28rpx;
+
+		&-item {
+			width: 100%;
+
+			& + & {
+				margin-top: 38rpx;
+			}
+		}
+
+		.icon {
+			width: 46rpx;
+			height: auto;
+			margin-right: 18rpx;
+		}
+
+		.label {
+			flex: 1;
+		}
+
+		.desc {
+			color: #999999;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index 58fbded..483e537 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<!-- 导航栏 -->
-		<navbar title="商品详情" leftClick @leftClick="$utils.navigateBack" />
+		<navbar title="商品详情" leftClick @leftClick="$utils.navigateBack" color="#fff" />
 
 		<uv-swiper :list="bannerList" indicator indicatorMode="dot" height="475rpx"></uv-swiper>
 
@@ -146,10 +146,12 @@
 				const TEMP_BANNER_IMG_URL = 'http://gips3.baidu.com/it/u=70459541,3412285454&fm=3028&app=3028&f=JPEG&fmt=auto?w=960&h=1280'
 
 				this.productDetail = {
+					imgUrl: TEMP_BANNER_IMG_URL,
 					image: new Array(4).fill(1).map(() => TEMP_BANNER_IMG_URL),
 					price: 99,
 					sales: 235,
 					title: '60分钟肩颈推拿按摩',
+					desc: '疏通经络 放松肌肉',
 					tags: ['专业技师', '舒适环境', '深度放松'],
 					details: '<p>这里是商品详情..............<br/>这里是商品详情..............</p>'
 				}
@@ -254,6 +256,7 @@
 		}
 
 		.detail {
+			margin-top: 12rpx;
 			padding: 18rpx 28rpx;
 			background-color: $uni-fg-color;
 
diff --git a/pages_order/static/createOrder/account.png b/pages_order/static/createOrder/account.png
deleted file mode 100644
index b5c5585ac4f121e47fec86b4e5681d3ef51a6a29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 839
zcmV-N1GxN&P)<h;3K|Lk000e1NJLTq001xm001Wl1^@s6Nzu!s00001b5ch_0Itp)
z=>Px&0ZBwbR9HvtS<h<|Q4s#-ZPy?|y(k`}zmrWx@Z!NDieAN&SkQXV{sDqi#iJB2
zUJ4>2f;XvWQN)Xf>ZO85g%Z+DV<}aXLPcmv+9dPIrcI5dt-EHkOT>2x$(#A+`*!BN
zo%bSGA8s<)Zd=yTGC2&9(-7&b%{A?lTmUess^g_X;qBr1`Ng2I#B<2>_Bw60eH*}_
zh$Mo7G-^+B736D@w;b2a1i_P;-rl`x+m8hpgop{^9Hy<1N?<CnynL)<e!k!rTc%T~
zOUAOE0B8fb0+Clx9anOeBJ>Ls)J{kdW4Z(w0&oT*?Nto&eqS~_B7m>hl1ry2A#&XF
z74oT8D%VrFoL8HXj45DOB9*!ZW9~x4BAHJBCp)v*FMbG!+uy$=z#h-os#FGgT=%^n
z$1rU^b$54bA~8Xc9splaDxFWx%)IjxLvsE7zfwg`L!{)#F-#khwg4Rv*$to!@-sx1
z>SC-wHA`TE<b>n8`P$s?0>Wg~9IRE68LHlKT=!YE?0?HZbApDBN^(Jfi^*(uq9p}@
zB!QQ0D=Sx8Q^4AGTQIAu1Fb8-6QMfP(gIj6kF>M^sNRfEfVT`cHuGvv8F+~5y?6wK
zK)$+;E0ssl3kZpPJOXOurLJV^f7@z)hr)_J1DgqM_r2O9{CQnOFCg$T-Ps{t0RhWp
zD=E<n@I%^<&AOWC1#I~kxmNE1h}U4^5wIQ6mJ{G}r`c&4$CH7L{D;y?JdFNLT>nV_
zqHOBjMRhb@0gb*FV(ms7CBJr{iLssjFW{faKssGS3|H!5RFF}<Dl_SHe*I1|49w^-
zNLs)-aUEw&jJXkA<j^9`S;gWhnN6h*l`ZQz04Fr)<^z>Pb*wl&J?b5MB<DDnAu<M$
zea(;ESOj{v*Q##{#o~n{b93LT=QaW+mrR~D#tc*B1c3bzA7{G8xCHVhP!jS3fEQ9K
zJ?P8le^mRydKB-UN~3x}jp;F#bx=3W2Z|V?u~983`O&uR#jZ@|n*dsa{|O;jh5qZu
R`7!_i002ovPDHLkV1h|%gkAsu

diff --git a/pages_order/static/createOrder/coupon.png b/pages_order/static/createOrder/coupon.png
deleted file mode 100644
index 2cae06cfd237600f17494beb78139978e4c710bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1485
zcmV;;1v2`HP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00001b5ch_0Itp)
z=>Px)he<?1RA@u(T3cuwRT%#M*|bp;C{@&|Rg&!NoY|&9Bn73uq#6{#3k8kTzIdhh
z;6ud=c&%c+q3wgBwJ1I)BGzJQK~X9eTd0D?8rsdAnORJ2yn$d)W1E!BZzjnuvy<7~
zGuzGX+Uz{-&N=_(JO4lb<(xxUU=J-Yyl4VG(=Fb#aMQwP*a|dVI?A9~(_F{Q*D!D`
z0iBIxbOv@3V0lE}8<w@RoNgs8obBpb;w@UVm4Lg-F=~+U{fR_kpfi*Ct(ZPV0lTKz
z3+C?{1V}73T7a$&DSwP2iUfSDr)TM@iHQt=Ww9hR&Scr%+S<EpaBwWFQY2tkh?f97
zlAp|c9Kd@X^A5vt4mS=iz)dDEpq7?97}yBlvVd-{=u$qc1UM_iZU$}&0DeHX?bjO#
zXjm85G&g{GTkbspUnHfxUJ0-(#LoaOo}E0QOWE4UU~{^;LW~1gJpG^fcipz<e3Hdn
zngam$=~Axwp8);}KwnN*UCKH5nt=V)afN7FxDuBhGR=;(Wevxn9Zsh&>KGdOH4aVS
z8?K*AJEpmXnEg~S4CalxZSN`t!V%&YVtxxm7lL`aZrdB;f_8<dAK=huF{&~5b=me0
zQ6SuOdL=yXYXD121)OpVP;bBo09+l&i-#AFjjg_PWaLCp@#D*vpFQ5zwjV%m;Qc{e
z%GKon&dJ49vM?BUlRfV>!*PaGm2iddQ`x5g&I-`%(xqG*<dGHPBL;2@ygNb6*ClP+
zUofR7E5s@W9s+QCkf74El;^?BFQjbyF(obhXdkM6rt1NsttrcT(EsfS@gf0_2Kf=u
z`lMxjpe#d(=Kwq&HD4L9BgFdztdC;Cz`H3a?^adFG0j(rc^Y8Az3*ot4}Op;e4fyy
z+^ovmHO=i{zAtJ%0eg~C-W(o_EIb@tZ`CwyBLf3O<R|5G3J95>*KIp;RilJEhOvi;
zZY&9e=tJGI)+vKEjLjeld)prj?AD0Bgr*%xW->o10WSE)(&-eK-(cqc+<OMbNYk#;
zhlY+QD=35nU=*2uM3=HhnO8c!l0EMm0@?yJ+gdd3*>X8tc~8qRj7>!JbU;94`;{A?
zo$tF_t_e}Y!+ey1k5jh2sTe`HeI;N=Qpy1p0m^`VX08yU0G9Z_i?v@lp{`*Z0a3S#
z5)pHL(WShk7;UJ19o41G=kIdz;sPE7Fynef+ONEYg?O8Qd&(&gC*b54Gtj;ga5yRD
z6{>RP4Y1qYtz&ZXhN=90-kiV@_%xXLnSybmqnMmLm~!2b5-y$Z*XJ9svP&0JHXI9>
zXidtp_NiLPpH~x?jvKV*6Y#tSt!#y9X?pYC^KJ#vxe?&=yAo476b06u%KiRs>E|ga
zcNcZ(YNsVTmFm(GiGE`4XTZ<Dg;7wU@QA39<9O{MUCLFZ2;7LmgMfdTS%PS9Vto9m
z&f(#cbK*x7Q>R3PRV^*Uty&zk0LlWMPLtItEknI*Ue`FygJYU~#OxO;LHAX`eF)4?
z>bCuv%4D}1%|jS)CGFvS2CXpfYPW|~-KMQZS}KvB>$k;IOA7}ou*L&?OxIVON+dp+
z?VPIWJ$2pFDiv`2eXNu1?N`RFu*wCoh6P+s@k+;=fSYGa(|!EhCv;r;=XfHqtUHsL
zsMOVJMVA%gAI@$2#5pbvABZz>Z%WE{YNdE3a$F(&)Bcxpv~dr_3$HxPbToTg$HumV
zPYx<kuG%!VY2K;Ll(8KF-s)E#N?dCB+b`^^t?+5`^FaoI`t0IeYMJds7S6S$+=?%#
zi)leOa}8rH1D9(=D;PNcG+nUT<bN^Ix8!-5a%a%K;8?qs)z-8g{F;F4vFf#y*|cyi
nSGyjvnij6ds@GEHg0t{{<-XZlO=b1k00000NkvXXu0mjfYgf{!

diff --git a/pages_order/static/createOrder/icon-account.png b/pages_order/static/createOrder/icon-account.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a279c0f7cbfbb1f42f9fb97854eb5f9469b874e
GIT binary patch
literal 896
zcmV-`1AqL9P)<h;3K|Lk000e1NJLTq001rk001or1^@s6(Jfh-00001b5ch_0Itp)
z=>Px&I!Q!9RA@u(m`iMoQ547j|NG5o8IOddwXvXtXi`xYbb$m5sve<VP>+<vt6@jl
zN@Ef%*tAw8UJ3E&43c^#LfDC*5;W};Arc9?kiK-Low-M5D3P?C>1W!jF|+;7|D50b
zfA`*R&LIr^o<7~?e((9RMk^^HkPRXrf+N9T$K6dc?zSg_#6*IU8B^VuzldU05S$CZ
z-JM$iEn3^7T;ZEbr`!p}t2t=kS6;84DLPUrBKagdJ%LeJ3r338Ouf-y9NgDXFp*>l
z$PEx=#sh-ZJ4Cl$u(Kbw^%Xl{j$f-^HBMW)NPyiCOpXiuGe9UG5aF`IX*I7%NN>8N
zgP(o3Al=hBW(fu5AZ8~D{70NZsWi8ruxH<E9&m7<uh6n`LURPH5MnU^<p>&x+T0Qm
zSs0j_TkEA)_jn$hCjWIC2v}X8pKV#zUXX<l4FB7lQ9XgmP$+z`DCgGKq=TP*upoWZ
z_%ZW^vK2r^GJt;>LUh5x&cdwgZ+qJ7N#Enigg0`l4D<ph0$!~zSOH~K2z55Vw1F<_
zD8I-z0iF+Yao@_Unn(0Eu384sHykB1BMMRJS@hK}ucP90GYrnE5;#wPU_}^!<t&9U
zRUiu9>u1#%R-D2jc%K3v%(s(rd@$XP)=D}4zd2r~6spo)T{qjGc$#e6AL)+)rmn+}
z(cZFd+N|5XH45<-VFa8&nRX33ZfE&pt(n(1cdQk3XGT=$qqpdBEBfd)yBA~x96*Uj
zb)JsSPYzw0mnXtwq~rp4MR9K|Uw8jyUyX9CLo)Hn7bUw!qU%f){P5-ZCk0p!!H5_T
zWph_^`xWo@XW#m4Bus-Jyg09lL@~h8KR{(|IH+p8#Ser395~25GTeR2p5X8Bp3BQn
zE>{`Bg`nJ4;;!7k{{H8G@^C`LN6LXjMs2+<z{no|u_NTDq@`8b6aAm!x!coobKtR)
zh&Lj9L7=r?@RTOA;QgZg9h~};<<L0CvXtYFt#c?$IquLn$Fh{;j;(Vj>~?&}jo=70
z4%MM&HLDv}u2Uix9lkXKGHFRu?!4Gw|5~76i&j=SL?#&^Nwj1efqOa>K4j<Is{IaU
W<B{=Q$Jb&20000<MNUMnLSTX|d8EPs

literal 0
HcmV?d00001

diff --git a/pages_order/static/createOrder/icon-coupon.png b/pages_order/static/createOrder/icon-coupon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0babea18aa4018f1d5683d1cd5a641d7fee7e1f3
GIT binary patch
literal 1815
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
FV1g)gbYB1f

literal 0
HcmV?d00001

diff --git a/pages_order/static/createOrder/icon-wx.png b/pages_order/static/createOrder/icon-wx.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b89bb9fd63c558be57cf48e2f2038343131c439
GIT binary patch
literal 1795
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

literal 0
HcmV?d00001

diff --git a/pages_order/static/createOrder/wx.png b/pages_order/static/createOrder/wx.png
deleted file mode 100644
index 626761768b062dac6805820de0937ba33f40dad1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2302
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
YAK@{U!Ujd8jQ{`u07*qoM6N<$f;~)A&;S4c