Merge branch 'v1.0.0' into v1.0.0_jd

pages/home-new.vue

@@ -35,10 +35,10 @@
 					</view>
 					<view class="banner-other">
 						<view @click="goShopH5(2)">
-							<image src="../static/index/1.png"></image>
+							<image src="https://nuoche.s3.cn-north-1.jdcloud-oss.com/2022/10/14/eb67b0d88bd24f71a04b6a939ef3bf74.png"></image>
 						</view>
 						<view @click="goShopH5(1)">
-							<image src="../static/index/2.png"></image>	
+							<image src="https://nuoche.s3.cn-north-1.jdcloud-oss.com/2022/10/14/672f38dadb0f4eacb486af28fe4fe762.png"></image>	
 						</view>
 					</view>
 					<u-gap bgColor="transparent" height="20"></u-gap>
@@ -489,7 +489,7 @@
 						width: 120rpx;height:112rpx;
 					}
 					&:last-child{
-						margin-top:70rpx;
+						margin-top:100rpx;
 						width: 172rpx;height:140rpx;
 					}
 					image{

pages/main.vue

@@ -23,6 +23,7 @@
 	import moveCar from './moveCar'
 	import shop from './shop'
 	import personal from './personal'
+	import util from '@/pages/login/util.js'
 	let plugin = requirePlugin('loginPlugin');
 
 	export default {
@@ -372,23 +373,25 @@
 												url:routerLogin
 											})
 										}
-									}
-									
-									// 判断是否有京东跳转
-									let jdNavto = uni.setStorageSync('jdNavto',index)
-									if(jdNavto){
-										let url;
-										if(jdNavto == 1){
-											url = 'https://pro.m.jd.com/mall/active/3L2hs3R3aibYmosCRzA2Rp5z8pTR/index.html?babelChannel=ttt1'
-										}else{
-											url = 'https://jarvis.m.jd.com/start?source=2'
-										}
+										// 判断是否有京东跳转
+										let jdNavto = uni.getStorageSync('jdNavto')
 										
-										// uni.setStorageSync('h5url',url)
-										util.navigateToH5({page:url})
-										uni.removeStorageSync('jdNavto')
+										if(jdNavto){
+											let url;
+											if(jdNavto == 1){
+												url = 'https://pro.m.jd.com/mall/active/3L2hs3R3aibYmosCRzA2Rp5z8pTR/index.html?babelChannel=ttt1'
+											}else{
+												url = 'https://jarvis.m.jd.com/start?source=2'
+											}
+											
+											// uni.setStorageSync('h5url',url)
+											util.navigateToH5({page:url})
+											uni.removeStorageSync('jdNavto')
+										}
 									}
 									
+									
+									
 								}else{
 									uni.hideLoading()
 									uni.showToast({

pages/shop.vue

@@ -19,7 +19,10 @@
                                 <image :src="getImage(vo.mainImgUrl)" />
                             </div>
                             <div class="item2__title">{{vo.title}}</div>
-                            <div class="item2__price">￥{{vo.currentPrice/100}}</div>
+                            <div class="item2__price">
+								￥{{vo.currentPrice/100}}
+								<text style="font-size: 22rpx;">起</text>
+							</div>
                         </div>
                     </div>
                 </div>
@@ -34,7 +37,8 @@
 								{{vo.title}}
 							</view>
 							<view class="one_item_price">
-								￥{{vo.currentPrice/100}}
+								￥{{vo.currentPrice/100}}								
+								<text style="font-size: 22rpx;margin-right:4rpx;">起</text>
 								<span class="num__two">￥{{vo.originalPrice/100}}</span>
 							</view>
 						</view>