历史修改上传

App.vue

@@ -86,7 +86,7 @@ uni-rich-text img {
 	height: 100%;
 }
 .default-img {
-	background: url('https://ceres.zkthink.com/static/root/default.png') no-repeat center;
+	// background: url('https://ceres.zkthink.com/static/root/default.png') no-repeat center;
 	background-size: 100% 100%;
 }
 

components/CashierList/index.vue

@@ -169,9 +169,12 @@ export default {
       this.paymentMode = 2
       // #endif
       // #ifdef APP-PLUS || H5
+	  console.log("H5")
       this.paymentList[0].disabled = false
       this.paymentList[1].disabled = true
       this.paymentList[2].disabled = true
+	  this.paymentList.splice(1, 1)
+	  this.paymentList.splice(1, 1)
       this.paymentMode = 1
       // #endif
     },

components/basics/categoryShow.vue

@@ -34,9 +34,7 @@
                         @click="handleJumpProductDetail(item)"
                     >{{ item.shopName }}
                     </view>
-                    <view class="shop-logo">
-                      <img :src="item.shopLogo">
-                    </view>
+                   
                   </view>
                   <view class="buy-count">{{ item.users ? item.users : 0 }}人付款</view>
                 </view>
@@ -234,7 +232,7 @@ export default {
     &-img {
       width: 348upx;
       height: 348upx;
-      background-color: #d0d0d0;
+      background-color: white;
       border-radius: 10upx 10upx 0 0;
 
       .img {

components/canvasShow/basics/discount/app/index.vue

@@ -13,7 +13,8 @@
         <swiper-item class="swiper-slide product-list-item-warp" v-for="(item,index) in productData.products.slice(0, 10)" :key="index" @click="jumpProductDetail(item)">
           <div class="product-list-item">
           <div class="product-list-img">
-            <img class="img default-img" :src="item.image">
+            <img class="img default-img" :src="item.image"
+			onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null">
           </div>
           <div class="product-list-info">
             <label class="product-name">{{item.productName}}</label>
@@ -51,7 +52,8 @@
         <div class="product-list-item-warp" v-for="(item,index) in productData.products" :key="index" @click="jumpProductDetail(item)">
           <div class="product-list-item">
           <div class="product-list-img">
-            <img class="img default-img" :src="item.image">
+            <img class="img default-img" :src="item.image" 
+			onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null">
           </div>
           <div class="product-list-info">
             <label class="product-name">{{item.productName}}</label>

components/canvasShow/basics/group/app/index.vue

@@ -18,7 +18,8 @@
           <div class="pro-item-inner">
             <div class="pro-item">
               <div class="pro-item-img">
-                <img class="img default-img" :src="item.image">
+                <img class="img default-img" :src="item.image" 
+				onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null">
               </div>
               <div class="pro-item-info">
                 <label class="name">{{item.productName}}</label>

components/canvasShow/basics/newProduct/app/index.vue

@@ -5,7 +5,7 @@
         <div class="product-swiper-warp" v-for="(item,index) in productData.slice(0, 3)" :key="index">
           <div class=" product-swiper-item" @click="jumpProductDetail(item)">
             <div class="product-swiper-img">
-              <img class="img pic-img default-img" :src="item.image">
+              <img class="img pic-img default-img" :src="item.image" onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null">
             </div>
             <div class="product-swiper-info">
               <label class="product-name">{{item.productName}}</label>

components/canvasShow/basics/price/app/index.vue

@@ -25,7 +25,7 @@
           <div class="pro-item-inner">
           <div class="pro-item">
           <div class="pro-item-img">
-            <img class="img default-img" :src="item.image">
+            <img class="img default-img" :src="item.image" onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null">
           </div>
           <div class="pro-item-info">
             <h3 class="name">

components/canvasShow/basics/product/app/index.vue

@@ -40,7 +40,8 @@
             <div class="product-list-img">
               <img
                   class="img pic-img default-img"
-                  :src="item.image"
+                  :src="item.image" 
+				  onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"
               >
             </div>
             <div class="product-list-info">
@@ -52,9 +53,6 @@
                     @click.stop="jumpStore(item)"
                 >
                   <label class="shop-name">{{ item.shopName }}</label>
-                  <div class="shop-logo">
-                    <img :src="item.shopLogo">
-                  </div>
                 </div>
                 <label class="buy-count">已售{{ item.number ? item.number : 0 }}件</label>
               </div>
@@ -191,6 +189,7 @@
               <img
                   class="img pic-img default-img"
                   :src="item.image"
+				  onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"
               >
             </div>
             <div class="product-list-info">
@@ -371,7 +370,7 @@ export default {
     &-img {
       width: 348rpx;
       height: 348rpx;
-      background-color: #f5f5f5;
+      background-color: white;
       border-radius: 10rpx 10rpx 0 0;
 
       .img {

components/canvasShow/basics/vip/app/index.vue

@@ -16,7 +16,8 @@
             <swiper-item class="vip-item-warp" v-for="(itemJ,indexJ) in listTemp" :key="indexJ">
               <div class="vip-item"  v-for="(item,index) in itemJ" :key="index"  @click="jumpProductDetail(item)">
                 <div class="vip-item-img">
-                  <image class="img default-img" :src="item.image"></image>
+                  <image class="img default-img" :src="item.image"
+				  onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"></image>
                 </div>
                 <div class="vip-item-info">
                   <h3 class="name">
@@ -60,7 +61,8 @@
           <div class="vip-item-warp" v-for="(itemJ,indexJ) in listTemp" :key="indexJ">
             <div class="vip-item"  v-for="(item,index) in itemJ" :key="index" @click="jumpProductDetail(item)">
               <div class="vip-item-img">
-                <img class="img default-img" :src="item.image">
+                <img class="img default-img" :src="item.image"
+				onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null">
               </div>
               <div class="vip-item-info">
                 <h3 class="name">

components/canvasShow/config/api.js

@@ -2,8 +2,9 @@
 
 // 获取当前环境变量 true => 生产环境 false => 开发环境
 // const BASEURL = process.env.VUE_APP_DOMAIN_PREFIX
-const BASEURL = (process.env.NODE_ENV === 'production') ? 'http://122.9.152.120/ceres-app-api' : 'http://122.9.152.120/ceres-app-api'
-// const BASEURL = (process.env.NODE_ENV === 'production') ? 'http://127.0.0.1:9007' : 'http://127.0.0.1:9007'
+// const BASEURL = (process.env.NODE_ENV === 'production') ? 'http://122.9.152.120/ceres-app-api' : 'http://122.9.152.120/ceres-app-api'
+// const BASEURL = (process.env.NODE_ENV === 'production') ? 'https://wechat.hnthee.com/ceres-app-api' : 'https://wechat.hnthee.com/ceres-app-api'
+const BASEURL = (process.env.NODE_ENV === 'production') ? 'http://127.0.0.1:9007' : 'http://127.0.0.1:9007'
 
 
 export const api = {

components/hoteRecommed/index.vue

@@ -11,7 +11,8 @@
         @click="goodsDateils(item.shopId,item.productId,item.skuId)"
       >
         <view class="itemImg">
-          <image :src="item.image" class="pic-img default-img"></image>
+          <image :src="item.image" class="pic-img default-img"
+		  onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"></image>
         </view>
         <view class="itemTit">{{item.productName}}</view>
         <view class="flex-items shopNameBox">

config/api.js

@@ -1,6 +1,6 @@
-// const DOMAIN_PREFIX = 'http://127.0.0.1:9007'
-const DOMAIN_PREFIX = 'http://122.9.152.120/ceres-app-api'
-// const DOMAIN_PREFIX = 'http://14.22.116.132:81/ceres-app-api'
+const DOMAIN_PREFIX = 'http://127.0.0.1:9007'
+// const DOMAIN_PREFIX = 'http://122.9.152.120/ceres-app-api'
+// const DOMAIN_PREFIX = 'https://wechat.hnthee.com/ceres-app-api'
 
 // const DOMAIN_PREFIX = 'https://ceres.zkthink.com/api'
 
@@ -23,7 +23,7 @@ module.exports = {
 	terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑
 	SettledMerchantPrefix: DOMAIN_PREFIX.replace('ceres-app-api', "ceres-settled-merchant/"), //商家入驻链接
 	// shareLink: DOMAIN_PREFIX + '/h5', // 分享地址
-	shareLink: 'https://ceres.zkthink.com/h5', // 分享地址
+	shareLink: 'https://wechat.hnthee.com/ceres-pc/', // 分享地址
 
 	//登录注册
 	Verify: WX_API_BASE + '/app/getCode', //  获取短信验证码

config/requestApi.js

@@ -20,6 +20,23 @@ export function doPointRequest(data){
         if (token) {
             header['Authorization'] = token
         }
+		
+		 var fullUrl = window.location.search;
+		  if (fullUrl.indexOf("?") != -1) {
+		    fullUrl = fullUrl.substring(1);
+		    var paramStrs = fullUrl.split("&");
+		    for(let i=0;i<paramStrs.length;i++){
+		      const newStrs = paramStrs[i].split("=");
+		      if(newStrs[0] === 'project'){
+		        header['project'] = newStrs[1]
+		        return config
+		      }
+		    }
+		    header['project'] = '0'
+		  }else{
+		    header['project'] = '0'
+		  }
+		  
         uni.request({
             url: API.doPointer,
             data: data,

manifest.json

@@ -1,7 +1,7 @@
 {
-    "name" : "cereshop",
+    "name" : "Thee",
     "appid" : "__UNI__D2138DD",
-    "description" : "cereshop",
+    "description" : "Thee",
     "versionName" : "1.7.4",
     "versionCode" : 174,
     "transformPx" : false,
@@ -60,7 +60,7 @@
                 "payment" : {
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appid" : "wxec665c74647095aa",
+                        "appid" : "wxd7066af4ee73022d",
                         "UniversalLinks" : "https://ceres.zkthink.com/apple-app-site-association"
                     }
                 },
@@ -71,7 +71,7 @@
                 "geolocation" : {},
                 "share" : {
                     "weixin" : {
-                        "appid" : "wxec665c74647095aa",
+                        "appid" : "wxd7066af4ee73022d",
                         "UniversalLinks" : "https://ceres.zkthink.com/apple-app-site-association"
                     }
                 },
@@ -83,33 +83,33 @@
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                    "hdpi" : "",
+                    "xhdpi" : "",
+                    "xxhdpi" : "",
+                    "xxxhdpi" : ""
                 },
                 "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "appstore" : "",
                     "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                        "app" : "",
+                        "app@2x" : "",
+                        "notification" : "",
+                        "notification@2x" : "",
+                        "proapp@2x" : "",
+                        "settings" : "",
+                        "settings@2x" : "",
+                        "spotlight" : "",
+                        "spotlight@2x" : ""
                     },
                     "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                        "app@2x" : "",
+                        "app@3x" : "",
+                        "notification@2x" : "",
+                        "notification@3x" : "",
+                        "settings@2x" : "",
+                        "settings@3x" : "",
+                        "spotlight@2x" : "",
+                        "spotlight@3x" : ""
                     }
                 }
             }
@@ -151,7 +151,7 @@
             "mode" : "hash",
             "base" : "/h5/"
         },
-        "title" : "cereshop",
+        "title" : "Thee",
         "domain" : "https://ceres.zkthink.com",
         "devServer" : {
             "port" : 8080, //端口号

pages.json

@@ -638,7 +638,7 @@
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "cereshop",
+		"navigationBarTitleText": "Thee",
 		"navigationBarBackgroundColor": "#fff",
 		"backgroundColor": "#F8F8F8",
 		"mp-weixin": {

pages/tabbar/cart/index.vue

@@ -16,7 +16,7 @@
             <view class="cart-num-box">
               <image
                   class="  u-skeleton-fillet"
-                  src="https://ceres.zkthink.com/static/images/logoTop.png"
+                  src="https://wechat.hnthee.com/ceres-local-file/image/logo_wechat.png"
               ></image>
               <text
                   class="btn-box "
@@ -116,6 +116,7 @@
                   <view class="pro-r">
                     <image
                         :src="skuItem.image"
+						onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"
                         class="pro-img default-img  u-skeleton-fillet"
                     ></image>
                     <view class="pro-r-r  u-skeleton-fillet">

pages/tabbar/category/index.vue

@@ -11,20 +11,31 @@
 					{{item.classifyName}}
 				</view>
 			</scroll-view>
-			<scroll-view scroll-with-animation scroll-y class="right-aside">
-				<view v-for="item in slist" :key="item.classifyId" class="s-list">
-			<view class="classBox flex-items-plus" v-if="item.childs.length>0">
-			  <image class="emptyOrder-img" src="https://ceres.zkthink.com/static/images/classRight.png"></image>
-			  <text class="s-item" >{{item.classifyName}}</text>
-			  <image class="emptyOrder-img" src="https://ceres.zkthink.com/static/images/classLeft.png"></image>
-			</view>
-					<view class="t-list">
-						<view @click="navToList(item.classifyId, titem.classifyId)" class="t-item" v-for="titem in item.childs" :key="titem.classifyId">
-							<image :src="titem.classifyImage" class="pic-img default-img"></image>
+			<scroll-view scroll-with-animation scroll-y class="right-aside" v-if="!ifEmpty">
+				<view v-if="onlyTwoLayer">
+					<view class="t-list" v-if="slist.length>0">
+						<view @click="navToList(titem.classifyPid, titem.classifyId)" class="t-item" v-for="titem in slist" :key="titem.classifyId">
+							<image :src="titem.classifyImage" class="pic-img"></image>
 							<text>{{titem.classifyName}}</text>
 						</view>
 					</view>
 				</view>
+				<view v-if="!onlyTwoLayer">
+					<view v-for="item in slist" :key="item.classifyId" class="s-list">
+						<view class="classBox flex-items-plus" v-if="slist.childs.length>0">
+							<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/images/classRight.png"></image>
+							<text class="s-item" >{{item.classifyName}}</text>
+							<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/images/classLeft.png"></image>
+						</view>
+						<view class="t-list">
+							<view @click="navToList(item.classifyId, titem.classifyId)" class="t-item" v-for="titem in slist.childs" :key="titem.classifyId">
+								<image :src="titem.classifyImage" class="pic-img"></image>
+								<text>{{titem.classifyName}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				
 			</scroll-view>
 			<view v-if="ifEmpty" class="emptyOrder-box flex-items-plus flex-column">
 				<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
@@ -46,7 +57,8 @@
 				currentId:'',
 				flist: [],
 				slist: [],
-        ifEmpty: false
+				ifEmpty: false,
+				onlyTwoLayer : true
 			}
 		},
 		onLoad() {
@@ -78,10 +90,14 @@
 					classifyId:this.currentId
 				},'GET').then(res => {
 					uni.hideLoading()
-					this.slist = res.data
-          if (this.slist.length === 0) {
-            this.ifEmpty = true
-          }
+					
+				  if (res.data.length === 0) {
+					this.ifEmpty = true
+				  }
+				  this.onlyTwoLayer = !this.slist.some(function(item){
+					  return item.childs.length>0
+				  });
+				  this.slist = res.data
 				}).catch(res => {
 					uni.hideLoading()
 				})

pages/tabbar/index/component/Agreement.vue

@@ -15,7 +15,7 @@
       <view class="text-align fs34 fs-bold">
         协议与隐私政策
       </view>
-      <p class="mar-top-20">欢迎来到cereshop！我们根据最新的法律、法规、监管政策要求，更新了cereshop隐私政策。</p>
+      <p class="mar-top-20">欢迎来到Thee商城！我们根据最新的法律、法规、监管政策要求，更新了cereshop隐私政策。</p>
       <view class="flex-display flex-sp-between">
         <view
             class="btn submit"

pages/tabbar/index/component/FixedHead.vue

@@ -23,7 +23,7 @@
       >
         <!-- logo -->
         <view class="logo_box">
-          <image src="https://ceres.zkthink.com/static/assets/img/logo.png" />
+          <image src="https://wechat.hnthee.com/ceres-local-file/image/logo_wechat.png" />
         </view>
         <!-- 右侧搜索 -->
         <template>
@@ -150,10 +150,11 @@ export default {
       justify-content: space-between;
       align-items: center;
       box-sizing: border-box;
+	  height: 100rpx;
 
       .logo_box {
-        width: 286rpx;
-        height: 72rpx;
+        width: 265rpx;
+        height: 50rpx;
       }
 
       .search_box {

pages/tabbar/index/index.vue

@@ -38,7 +38,7 @@
 
       <global-loading />
 
-      <ad-window
+      <AdWindow
           ref="adWindow"
           :triggerCondition="1"
       />
@@ -90,7 +90,9 @@ export default {
   onLoad() {
     this.$nextTick(async () => {
       await this.handleGetCanvas()
-      this.$refs.adWindow.getAd()
+	  if(this.$refs.adWindow){
+		  this.$refs.adWindow.getAd()
+	  }
     })
   },
   onPageScroll(e) {

pages/tabbar/user/index.vue

@@ -493,6 +493,7 @@ page {
     bottom: 0;
     left: 0;
     width: 100%;
+	display: none;
 
     text {
       display: block;

pages_category_page1/discount/spikeList.vue

@@ -51,7 +51,9 @@
 		<view class="spikeList mar-top-20">
 			<view class="listItem" v-for="(item,index) in spikeLikeList" :key="index">
 				<view class="itemBox">
-					<img :src="item.productImage || item.image" class="pic-img default-img">
+					<img :src="item.productImage || item.image" 
+					onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"
+					class="pic-img default-img">
 				</view>
 				<view class="itemInfo">
 					<p>{{item.productName}}</p>

pages_category_page1/distributionModule/shareProduct.vue

@@ -1,21 +1,12 @@
 <template>
 	<view>
-    <global-loading />
+		<global-loading />
 
-    <u-mask :show="show" z-index="10000">
+		<u-mask :show="show" z-index="10000">
 			<view class="warp">
+				  <view class="titleBox">好物分享</view>
 				<view class="rect" @tap.stop>
-					<!-- 关闭按钮 -->
-					<view class="guanbiView">
-						<!-- #ifdef MP-WEIXIN -->
-						<img @click="showcos" src="https://ceres.zkthink.com/static/img/guanbi.png" class="guanbi"
-							style="width:30px;height:30px;" mode="widthFix"></img>
-						<!-- #endif -->
-						<!-- #ifdef H5 || APP-PLUS -->
-						<image @click="showcos" src="https://ceres.zkthink.com/static/img/guanbi.png" class="guanbi"
-							style="width:30px;height:30px;" mode="widthFix"></image>
-						<!-- #endif -->
-					</view>
+					
 					<!-- 内容 -->
 					<view class="imgBox">
 						<view v-if="shareType==1" class="boxInner imgBoxShop"
@@ -252,7 +243,26 @@
 		align-items: center;
 		justify-content: center;
 		height: 100%;
-
+		width: 100%;
+		background: linear-gradient(30deg, #183ECD, #689FFF);
+		/* box-sizing: border-box; */
+		padding-left: 110rpx;
+		padding-top: 280rpx;
+		padding-right: 110rpx;
+		padding-bottom: 300rpx;
+		/* padding: 100rpx; */
+		box-sizing: border-box;
+	}
+	
+	.titleBox{
+		    font-size: 48rpx;
+		    font-family: Source Han Sans CN;
+		    font-weight: bold;
+		    color: #183ECD;
+		    display: block;
+		    position: absolute;
+		    top: 12%;
+		    left: 15%;
 	}
 
 	.qrimg-i {
@@ -262,10 +272,21 @@
 	.rect {
 		background-color: #fff;
 		position: relative;
-		margin-top: -20rpx;
+		border-radius: 20rpx;
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 40rpx;
 
 		.imgBox {
-
+			display: flex;
+			align-items: center;
+			justify-content: center;	
+			width: 100%;
+			    height: 100%;
+			
 			.boxInner {
 				display: inline-block;
 				background-size: contain !important;
@@ -274,13 +295,13 @@
 			}
 
 			.imgBoxShop {
-				min-height: 814upx;
-				min-width: 426upx;
+				width: 100%;
+				    height: 100%;
 			}
 
 			.imgBoxProduct {
-				min-height: 700upx;
-				min-width: 426upx;
+				width: 100%;
+				    height: 100%;
 			}
 		}
 

pages_category_page1/goodsModule/canvasGoods.vue

@@ -39,7 +39,8 @@
     <view v-if="list.length>0" class="listBox">
       <view v-for="(item, index) in list" :key="index" class="goodsDetails-box flex-display flex-column" @click="goodsDateils(item.shopId,item.productId,item.skuId)">
         <view v-if="item.activityType === 0" class="goodsDetails flex-items-plus flex-row">
-          <image class="goodsImg default-img" :src="item.image"></image>
+          <image class="goodsImg default-img" :src="item.image"
+		  onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"></image>
           <view class="mar-left-30">
             <view class="goodsName-box overflowNoDot">
               <label class="goodsName fs26">{{item.productName}}</label>
@@ -66,7 +67,8 @@
         <view v-else class="spikeList goodsDetails">
           <view class="listItem">
             <view class="itemBox">
-              <img :src="item.image" class="pic-img default-img">
+              <img :src="item.image" class="pic-img default-img"
+			  onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null">
             </view>
             <view class="itemInfo mar-top-30">
               <p>{{item.productName}}</p>
@@ -295,9 +297,6 @@ input{padding-left: 80upx;}
         }
       }
       .shopName {
-        position: absolute;
-        left: 0;
-        top: 0;
         height: 50rpx;
         background: #333333;
         opacity: 1;

pages_category_page1/goodsModule/combination.vue

@@ -14,7 +14,8 @@
     <view class="combinationList">
       <view class="combinationItem" v-for="(item, index) of productList" :key="index" @click="goodsDateils(item.shopId,item.productId,item.skuId)">
         <view class="imgBox">
-          <image :src="item.image" class="pic-img default-img"></image>
+          <image :src="item.image" class="pic-img default-img"
+		  onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"></image>
         </view>
         <view class="itemInfoBox">
           <view class="itemTit">{{item.productName}}</view>
@@ -35,7 +36,8 @@
     <u-popup v-model="goosDetailshowFlag" mode="bottom" border-radius="14">
       <view class="goosDetailshow-box">
         <view class="detailImg-box flex-row-plus">
-          <image class="detailImg default-img" :src="skuImg"></image>
+          <image class="detailImg default-img" :src="skuImg"
+		  onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"></image>
           <view class="flex-column-plus mar-left-40">
             <view class="font-color-C5AA7B">
               <label class="fs24">¥</label>

pages_category_page1/goodsModule/components/GoodActivityDetail.vue

@@ -20,6 +20,7 @@
         <image
             class="goodsImg default-img u-skeleton-fillet"
             :src="imgItem"
+			onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"
         ></image>
       </swiper-item>
     </swiper>

pages_category_page1/goodsModule/goodsDetails.vue

@@ -183,6 +183,7 @@
             <image
                 @click="handleJumpToStore"
                 class="inStore-logo default-img"
+				onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"
                 :src="productData.shopLogo"
             ></image>
           </view>
@@ -729,8 +730,13 @@ export default {
         // 评价
         this.commentList = res.data.comments
         // 宝贝详情
-        this.sellDescList = res.data.text.replace(/\<img/gi,
-            '<img style="max-width:100%;height:auto" ')
+		
+        this.sellDescList = res.data.text.replace(/\<img class=\"wscnph\"/gi,
+            '<img')
+			.replace(/\<img style=\"display: block; margin-left: auto; margin-right: auto;\"/gi,
+			    '<img')
+			.replace(/\<img/gi,
+            '<img style="display:block;float: none;margin: 0;padding: 0;width:100%;max-width:100%;height:auto" ')
 
         //渲染商详之后，如果参数传了skuId，则选中该skuId，否则选中第一个规格
         this.$nextTick(async () => {

pages_category_page1/goodsModule/goodsList.vue

@@ -99,6 +99,7 @@
               <img
                   :src="item.image"
                   class="pic-img default-img"
+				  onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"
               >
             </view>
             <view class="itemInfo">
@@ -107,6 +108,7 @@
                   class="number"
                   v-if="item.number != null"
               >
+			 
                 <view class="numText">已售{{ item.number }}件</view>
                 <view
                     class="numText"
@@ -486,9 +488,6 @@ input {
       }
 
       .shopName {
-        position: absolute;
-        left: 0;
-        top: 0;
         height: 50rpx;
         background: #333333;
         opacity: 1;

pages_category_page1/goodsModule/userEvaluate.vue

@@ -60,7 +60,9 @@
             </view>
             <view class="goodsDes-box u-skeleton-fillet flex-column-plus mar-top-30">
               <view class="flex-row-plus" @click.stop="goGoodsDetails(item.shopId,item.productId,item.skuId)">
-                <image class="goodsDes-img default-img" :src="item.productImage"></image>
+                <image class="goodsDes-img default-img" 
+				onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"
+				:src="item.productImage"></image>
                 <view class="goodsDesText-box">
                   <label class="fs26 goodsDes-text">{{item.productName}}</label>
                   <view class="mar-top-70">

pages_category_page1/linkOthers/index.vue

@@ -13,7 +13,8 @@ export default {
   },
   onLoad(e) {
     // 获取传递过来的链接
-    this.url = `${e.url}/#/?&username=${e.username}&user=${e.user}`
+    this.url = `${e.url}/#/?&username=${e.username}&user=${e.user}&t=1`
+	console.log(this.url)
   }
 }
 </script>

pages_category_page1/orderModule/index.vue

@@ -61,6 +61,7 @@
                 <image
                     :src="skuItem.image"
                     class="product-img default-img"
+					onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"
                 />
                 <view class="info-box">
                   <text class="product-name">{{ skuItem.productName&&skuItem.productName }}</text>

pages_category_page1/orderModule/orderConfirm.vue

@@ -1209,6 +1209,7 @@ export default {
         let shopsobj = {}
         shopsobj["shopId"] = this.settlement.shops[n].shopId
         shopsobj["sceneId"] = this.settlement.shops[n].sceneId
+		shopsobj["isCross"] = this.settlement.shops[n].isCross
         shopsobj["distribution"] = {}
         shopsobj["skus"] = []
         if (this.settlement.shops[n].currentCoupon) {

pages_category_page1/orderModule/orderDetails.vue

@@ -117,7 +117,8 @@
 								<view class="order-info">
 									<view class="order-info-item" v-for="proItem in dataList.skus"
 										:key="proItem.productId" @click="goodsItemTap(proItem.productId,proItem.skuId)">
-										<image :src="proItem.image" class="product-img default-img"></image>
+										<image :src="proItem.image" class="product-img default-img"
+										onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"></image>
 										<view class="info-box">
 											<text class="product-name">{{ proItem.productName }}</text>
 											<view class="price-sku-box">

pages_category_page1/store/index.vue

@@ -119,7 +119,8 @@
 							<view class="shop-list-box" v-if="total > 0">
 								<view class="item" v-for="(cItem, index) in storeInfolist" :key="index"
 									@click="goodsItemTap(cItem.productId,cItem.skuId)">
-									<image :src="cItem.image" class="product-img default-img"></image>
+									<image :src="cItem.image" class="product-img default-img"
+									onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"></image>
 									<view class="product-bottom-box">
 										<view class="product-name">{{cItem.productName}}</view>
 										<view class="product-num font-color-C5AA7B mar-top-10">已售{{cItem.number}}件

pages_category_page2/channelCoupon/index.vue

@@ -52,9 +52,6 @@
                 <div class="flex">
                   <div class="shop-box" @click.stop="jumpStore(item)">
                     <label class="shop-name">{{item.shopName}}</label>
-                    <div class="shop-logo">
-                      <img :src="item.shopLogo">
-                    </div>
                   </div>
                   <label class="buy-count">{{item.users?item.users: 0}}人付款</label>
                 </div>

pages_category_page2/userModule/accountLogin.vue

@@ -5,7 +5,7 @@
     <view class="login-logoBox">
       <image
           class="login-logo"
-          src="https://ceres.zkthink.com/static/images/loginLogo.png"
+          src="https://wechat.hnthee.com/ceres-local-file/image/logo_wechat.png"
       ></image>
     </view>
     <view class="iphoneNum-box flex-row-plus flex-items">
@@ -262,12 +262,12 @@ export default {
   height: 100vh;
 
   .login-logoBox {
-    margin-top: -300rpx;
-
-    .login-logo {
-      width: 234rpx;
-      height: 193rpx;
-    }
+  	margin-top: -300rpx;
+  
+  	.login-logo {
+  		width: 518rpx;
+  		height: 100rpx;
+  	}
   }
 
   .iphoneNum-box {

pages_category_page2/userModule/address.vue

@@ -252,8 +252,8 @@
 
 				.wxAddress {
 					image {
-						width: 45rpx;
-						height: 37rpx;
+						width: 75rpx;
+						height: 75rpx;
 						margin-right: 20rpx;
 					}
 				}

pages_category_page2/userModule/collection.vue

@@ -34,7 +34,10 @@
 											class="cart-select-img"></image>
 									</view>
 									<view class="infoCent flex-items">
-										<image class="product-img default-img" mode="aspectFill" :src="item.image" />
+										<image 
+										onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"
+										class="product-img default-img" mode="aspectFill" :src="item.image" />
+										
 										<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
 										<view class="title-wrap mar-left-20 priceBox">
 											<text
@@ -123,7 +126,8 @@
 										<view class="itemImgBox" v-for="(sItem, sIndex) of item.productList"
 											:key="sIndex"
 											@click.stop="goodsDateils(sItem.shopId,sItem.productId,sItem.skuId)">
-											<image :src="sItem.image" class="pic-img default-img"></image>
+											<image :src="sItem.image" class="pic-img default-img"
+											onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"></image>
 										</view>
 									</view>
 								</view>

pages_category_page2/userModule/footprintList.vue

@@ -28,7 +28,9 @@
                   <image v-if="item.selected == 1" @click.stop="footItemSel(index,findex,0)" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"></image>
                   <image v-else @click.stop="footItemSel(index,findex,1)" src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img"></image>
                 </view>
-                <image class="product-img default-img" mode="aspectFill" :src="item.image" />
+                <image class="product-img default-img" 
+				onerror="this.src='url(https://ceres.zkthink.com/static/root/default.png) no-repeat center';this.οnerrοr=null"
+				mode="aspectFill" :src="item.image" />
                 <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
                 <view class="title-wrap mar-left-20">
                   <text class="title u-line-2 fs28">{{ item.productName }}</text>

pages_category_page2/userModule/login.vue

@@ -2,7 +2,7 @@
 	<view class="container flex-items-plus flex-column">
     <global-loading />
 		<view class="login-logoBox">
-			<image class="login-logo" src="https://ceres.zkthink.com/static/images/loginLogo.png"></image>
+			<image class="login-logo" src="https://wechat.hnthee.com/ceres-local-file/image/logo_wechat.png"></image>
 		</view>
 		<view class="loginTitle-text flex-column-plus flex-items font-color-666 fs26">
 			<text>为了给您提供更好的服务</text>
@@ -287,8 +287,8 @@
 			margin-top: -200rpx;
 
 			.login-logo {
-				width: 200rpx;
-				height: 167rpx;
+				width: 518rpx;
+				height: 100rpx;
 			}
 		}
 

pages_category_page2/userModule/mobilePhone.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container flex-items-plus flex-column">
 		<view class="login-logoBox">
-			<image class="login-logo" src="https://ceres.zkthink.com/static/images/loginLogo.png"></image>
+			<image class="login-logo" src="https://wechat.hnthee.com/ceres-local-file/image/logo_wechat.png"></image>
 		</view>
 		<view class="loginTitle-text flex-column-plus flex-items font-color-666 fs26">
 			<label>为了给您提供更好的服务</label>
@@ -92,8 +92,8 @@
 			margin-top: 154upx;
 
 			.login-logo {
-				width: 250upx;
-				height: 250upx;
+				width: 518upx;
+				height: 100upx;
 			}
 		}
 

pages_category_page2/userModule/personalDetails.vue

@@ -30,11 +30,11 @@
 			</view>
 			<view class="personalHead-box flex-sp-between flex-display flex-items">
 				<label>真实姓名</label>
-				<input class="nameInput" v-model="realName" type="text" placeholder="请输入真实姓名" @blur="changeName" />
+				<input class="nameInput" v-model="realName" type="text" placeholder="请输入真实姓名" @blur="changeRealName" />
 			</view>
 			<view class="personalHead-box flex-sp-between flex-display flex-items">
 				<label>身份证</label>
-				<input class="nameInput" v-model="idCard" type="text" placeholder="请输入身份证" @blur="changeName" />
+				<input class="nameInput" v-model="idCard" type="text" placeholder="请输入身份证" @blur="changeIdCard" />
 			</view>
 		</view>
 	

unpackage/dist/build/h5/index.html

@@ -0,0 +1,2 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>Thee</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.f5158ce0.js></script><script src=/h5/static/js/index.10a0e263.js></script></body></html>