越南

addons/unishop/uniapp/uni-shop/pages/order/createOrder.vue

@@ -62,7 +62,7 @@
 				</view>
 			</view>
 			<view class="c-list">
-				<view class="c-row b-b" @click="toggleSpec">
+				<view class="c-row b-b" @click="toggleSpec"  v-if="products.use_spec">
 					<text class="tit">Kích thước</text>
 					<view class="con">
 						<text class="selected-text">
@@ -185,7 +185,7 @@
 						</text>
 					</view>
 				</view>
-				<button class="btn" @click="toggleSpec">完成</button>
+				<button class="btn" @click="toggleSpec">OK</button>
 			</view>
 		</view>
 	</view>
@@ -325,11 +325,15 @@
 			toggleSpec() {
 				if (this.specClass === 'show') {
 					// 从商品进入
+					uni.showLoading({
+						title: 'loading'
+					});
 					this.getOrderCreate({
 						id: this.id,
 						spec: this.specSelected.join(','),
-						flash_id: this.flash_id
+						flash_id: null
 					}).then(()=>{
+						uni.hideLoading();
 						this.specClass = 'hide';
 						setTimeout(() => {
 							this.specClass = 'none';
@@ -496,7 +500,8 @@
 					this.submitLock = false; // 解除锁
 					uni.showModal({
 						showCancel: false,
-						title: '提示',
+						title: 'MESSAGE',
+						confirmText: 'OK',
 						content: '    Quý khách hàng thân mến。\nBạn đã đặt hàng thành công. Bộ phận hỗ trợ của chúng tôi sẽ liên hệ bạn trong thời gian sớm nhất. ',
 						success: (res) => {
 							uni.redirectTo({

addons/unishop/uniapp/uni-shop/pages/product/product.vue

@@ -10,42 +10,6 @@
 			</swiper>
 		</view>
 
-		<!-- 秒杀的话才显示 -->
-		<view class="flash" v-if="flash">
-			<view class="sales_price" v-if="product.market_price"><view class="symbol">￥</view>{{specProduct.sales_price}}</view>
-			<view class="left" v-if="product.market_price">
-				<view class="market_price">￥{{specProduct.market_price}}</view>
-				<view class="sold" v-if="progress.number">秒{{progress.number}}件</view>
-			</view>
-			<view class="right">
-				<view class="time" v-if="countdown && progress.number != progress.sold">
-					{{product.flash.text}}
-					<uni-countdown
-					ref="countd"
-					:showDay="countdown.day > 0 ? true : false"
-					:day="countdown.day"
-					:hour="countdown.hour"
-					:minute="countdown.minute"
-					:second="countdown.second"
-					@timeup="timeup"
-					color="#fffa30"
-					borderWidth="22rpx"
-					splitorColor="#fffa30"
-					background-color="#282f2c00"
-					border-color="#00B26A"></uni-countdown>
-				</view>
-				<view class="time" v-else :class="{'flashDone': progress.number == false}">抢购已结束</view>
-				<view class="progress" v-if="progress.number">
-					<ProgressBar
-					class="ProgressBar"
-					:Sold="progress.sold"
-					:widthUpx="250"
-					:Width="percentage(progress.number, progress.sold)"
-					Type="candy"
-					:Vice="true"></ProgressBar>
-				</view>
-			</view>
-		</view>
 
 		<view class="introduce-section" v-if="product.product_id">
 			<view style="display: flex;justify-content: space-between;align-items: center;">
@@ -64,20 +28,6 @@
 			</view>
 		</view>
 
-		<!--  分享 分销 第二版本做-->
-		<!-- <view class="share-section" @click="share">
-			<view class="share-icon">
-				<text class="yticon icon-xingxing"></text>
-				 返
-			</view>
-			<text class="tit">该商品分享可领49减10红包</text>
-			<text class="yticon icon-bangzhu1"></text>
-			<view class="share-btn">
-				立即分享
-				<text class="yticon icon-you"></text>
-			</view>
-		</view> -->
-
 		<view class="c-list">
 			<view class="c-row b-b" @click="toggleSpec" v-if="product.use_spec">
 				<text class="tit">Kích thước</text>
@@ -89,7 +39,7 @@
 				</view>
 				<text class="yticon icon-you"></text>
 			</view>
-			<view class="c-row b-b" v-if="product.server">
+			<view class="c-row b-b">
 				<text class="tit">Hỗ trợ mua hàng</text>
 				<view class="bz-list con">
 					<svg t="1620655994453" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2670" width="20" height="20"><path d="M878.08 731.274667a32 32 0 0 1-54.88-32.938667A360.789333 360.789333 0 0 0 874.666667 512c0-200.298667-162.368-362.666667-362.666667-362.666667S149.333333 311.701333 149.333333 512s162.368 362.666667 362.666667 362.666667a360.789333 360.789333 0 0 0 186.314667-51.445334 32 32 0 0 1 32.928 54.88A424.778667 424.778667 0 0 1 512 938.666667C276.362667 938.666667 85.333333 747.637333 85.333333 512S276.362667 85.333333 512 85.333333s426.666667 191.029333 426.666667 426.666667c0 78.293333-21.152 153.568-60.586667 219.274667zM374.581333 489.450667l84.341334 83.989333 190.432-190.72a32 32 0 0 1 45.290666 45.226667l-213.013333 213.333333a32 32 0 0 1-45.226667 0.064l-106.986666-106.549333a32 32 0 1 1 45.162666-45.344z" p-id="2671" fill="#d81e06"></path></svg><text style="margin: 0 15upx">Freeship</text>
@@ -136,10 +86,10 @@
 			<view>
 				<view v-for="(item, index) in product.qa" :key="index" style="font-size:14px;border-bottom: 1px solid #cccccc">
 					<view style="margin: 20px 10px">
-						<text class="icons orange">问</text>：<text  class="bold">{{item.question}}</text>
+						<text class="icons orange">Q</text>：<text  class="bold">{{item.question}}</text>
 					</view>
 					<view style="margin: 20px 10px">
-						<text class="icons green">答</text>： {{item.answer}}
+						<text class="icons green">A</text>： {{item.answer}}
 					</view>
 				</view>
 			</view>
@@ -190,7 +140,7 @@
 						</text>
 					</view>
 				</view>
-				<button class="btn" @click="toggleSpec">完成</button>
+				<button class="btn" @click="toggleSpec">OK</button>
 			</view>
 		</view>
 

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>宜家自购商城</title><script>document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
-			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.99ddd405.js></script><script src=/h5/static/js/index.aaf9128d.js></script></body></html>
+			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.99ddd405.js></script><script src=/h5/static/js/index.ea55b975.js></script></body></html>