一家

addons/unishop/uniapp/uni-shop/pages/money/pay.vue

@@ -38,8 +38,14 @@
 			</view> -->
 		</view>
 		<uni-popup ref="popup" type="center" :maskClick="false">
-			<image mode="aspectFit" :src="'http://internalsales.iicn.co/addons/unishop/order/addQRCode?url=' + encodeURIComponent(site)">
-			</image>
+			<div style="text-align:center;width: 100%">
+				<image mode="aspectFit" :src="'http://internalsales.iicn.co/addons/unishop/order/addQRCode?url=' + encodeURIComponent(site)">
+				</image>
+			</div>
+
+			<p style="padding: 50upx">
+				After finishing your payment, the page will not automatically jump. Please find your completed order in ‘My-My order’
+			</p>
 		</uni-popup>
 		<text class="mix-btn" @click="confirm">Confirm Pay</text>
 	</view>

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

@@ -102,6 +102,29 @@
 				<view class="cell-tit clamp">Remarks</view>
 				<input class="desc" type="text" v-model="remark" placeholder="Please fill in the remarks" placeholder-class="placeholder" />
 			</view>
+
+			<view>
+				<div style="padding: 50upx;font-size: 30upx">
+					<p style="padding-bottom: 20upx">
+						The undersigned, the co-worker, hereby declares that the goods from IKEA, components of IKEA goods or accessories thereof, called “the goods” hereafter and received from IKEA shall only be used by co-worker himself/herself and shall not be offered to any third parties.
+					</p>
+					<p style="padding-bottom: 20upx">
+						These goods or a part of these goods or any component thereof shall not in any event be sold. IKEA reserves the right carefully to monitor this and moreover by means of unannounced visits on site.
+					</p>
+					<p style="padding-bottom: 20upx">
+						The transport of the goods received is payable by the co-worker and the assembly of the goods receives is the responsibility of the co-worker.
+					</p>
+					<p style="padding-bottom: 20upx">
+						IKEA cannot be held liable at any time for any damage to the goods acquired, the incompleteness thereof or accidents resulting from the handling or use of the goods acquired.
+					</p>
+					<p style="padding-bottom: 20upx">
+						At the receipt of 10 or more items, each with a different IKEA item number, IKEA wishes to be presented a brief report which clearly stated what the goods received and the address at which they are set-up. This report must be documented with the necessary photographs and must be signed by the co-worker. The full report must be in the possession of IKEA at the latest 45 calendar days after signature of this declaration.
+					</p>
+					<p style="padding-bottom: 20upx">
+						If one of these conditions is not complied with the cooperation shall immediately be ruptured and terminated and IKEA reserves the right to demand the return of the donated goods.
+					</p>
+				</div>
+			</view>
 		</view>
 
 		<!-- 底部 -->
@@ -111,7 +134,8 @@
 				<text class="price-tip">￥</text>
 				<text class="price">{{total}}</text>
 			</view>
-			<text class="submit" @click="submit">Submit Order</text>
+			<text v-if="width>750" class="submit" style="width: 600upx;" @click="submit">Agree Declaration and Submit Order</text>
+			<text v-else class="submit" @click="submit">Submit Order</text>
 		</view>
 
 		<!-- 优惠券面板 -->
@@ -163,7 +187,8 @@
 				cart: [], // 购物车id
 				flash_id: 0, // 秒杀id
 				progress:{},
-				submitLock:false // 提交按钮锁
+				submitLock:false, // 提交按钮锁
+				width:750
 			}
 		},
 		onLoad(options) {
@@ -394,6 +419,10 @@
 			deliveryTemplate() {
 				this.$api.navTo('/pages/order/delivery');
 			}
+		},
+		mounted(){
+			console.log(window.innerWidth)
+			this.width=window.innerWidth
 		}
 	}
 </script>

addons/unishop/uniapp/uni-shop/pages/public/login.vue

@@ -146,6 +146,7 @@
 		z-index: 90;
 		background: #fff;
 		padding-bottom: 40upx;
+		max-width: 1000upx;
 	}
 
 	.back-btn {