소스 검색

修改前端代码

yongzonghuang 4 년 전
부모
커밋
f9d119dca1
100개의 변경된 파일697개의 추가작업 그리고 643개의 파일을 삭제
  1. 11 1
      .gitignore
  2. 5 5
      component/share.vue
  3. 3 3
      components/activities/combinedSales.vue
  4. 1 1
      components/basics/categoryShow.vue
  5. 1 1
      components/canvasShow/basics/live/app/item.vue
  6. BIN
      components/canvasShow/static/images/discount/bg-discount-more.png
  7. BIN
      components/canvasShow/static/images/discount/bg-discount-top.png
  8. 61 53
      components/goodsDetalils/coupon-popup.vue
  9. 1 1
      components/hoteRecommed/index.vue
  10. 1 1
      components/modal/modal.vue
  11. 1 1
      components/notice/notice.vue
  12. 40 24
      components/wx/wxSendCoupon.vue
  13. 6 6
      manifest.json
  14. 8 8
      pages.json
  15. 13 12
      pages/tabbar/cart/index.vue
  16. 4 4
      pages/tabbar/category/index.vue
  17. 12 6
      pages/tabbar/index/index.vue
  18. 30 30
      pages/tabbar/user/index.vue
  19. 1 1
      pages_category_page1/activity.vue
  20. 7 3
      pages_category_page1/coupon/list.vue
  21. 2 2
      pages_category_page1/coupon/product.vue
  22. 6 6
      pages_category_page1/discount/discount.vue
  23. 3 3
      pages_category_page1/discount/groupBuy.vue
  24. 7 7
      pages_category_page1/discount/platformDiscount.vue
  25. 2 2
      pages_category_page1/discount/spikeList.vue
  26. 1 1
      pages_category_page1/distributionModule/index.vue
  27. 5 5
      pages_category_page1/distributionModule/invite.vue
  28. 4 4
      pages_category_page1/distributionModule/promotion.vue
  29. 1 1
      pages_category_page1/distributionModule/recruit.vue
  30. 4 4
      pages_category_page1/distributionModule/salesIndex.vue
  31. 5 5
      pages_category_page1/distributionModule/shareProduct.vue
  32. 7 7
      pages_category_page1/distributionModule/totalAward.vue
  33. 4 4
      pages_category_page1/distributionModule/totalClient.vue
  34. 4 4
      pages_category_page1/distributionModule/totalPersonnel.vue
  35. 7 7
      pages_category_page1/distributionModule/unliquidated.vue
  36. 1 1
      pages_category_page1/goodsModule/addEvaluate.vue
  37. 15 15
      pages_category_page1/goodsModule/canvasGoods.vue
  38. 3 3
      pages_category_page1/goodsModule/combination.vue
  39. 10 6
      pages_category_page1/goodsModule/couponShopList.vue
  40. 1 1
      pages_category_page1/goodsModule/evaSuccessful.vue
  41. 1 1
      pages_category_page1/goodsModule/evaluate.vue
  42. 4 4
      pages_category_page1/goodsModule/evaluateDetails.vue
  43. 3 3
      pages_category_page1/goodsModule/evaluateList.vue
  44. 25 29
      pages_category_page1/goodsModule/goodsDetails.vue
  45. 9 9
      pages_category_page1/goodsModule/goodsList.vue
  46. 47 31
      pages_category_page1/goodsModule/inviteSpell.vue
  47. 2 2
      pages_category_page1/goodsModule/putQuestions.vue
  48. 8 8
      pages_category_page1/goodsModule/userEvaluate.vue
  49. 4 4
      pages_category_page1/homeModule/special.vue
  50. 18 6
      pages_category_page1/integral/exchangeDetail.vue
  51. 12 12
      pages_category_page1/integral/index.vue
  52. 2 4
      pages_category_page1/integral/sign.vue
  53. 6 6
      pages_category_page1/memberCenter/activityList.vue
  54. 3 3
      pages_category_page1/memberCenter/index.vue
  55. 3 3
      pages_category_page1/memberCenter/memberSign.vue
  56. 1 1
      pages_category_page1/orderModule/Intervene.vue
  57. 2 2
      pages_category_page1/orderModule/addLogistics.vue
  58. 10 10
      pages_category_page1/orderModule/afterSaleApplyRefund.vue
  59. 9 9
      pages_category_page1/orderModule/afterSaleApplyRetund.vue
  60. 4 4
      pages_category_page1/orderModule/index.vue
  61. 1 1
      pages_category_page1/orderModule/logisticsInfo.vue
  62. 38 35
      pages_category_page1/orderModule/orderConfirm.vue
  63. 16 16
      pages_category_page1/orderModule/orderDetails.vue
  64. 2 2
      pages_category_page1/orderModule/paySuccessful.vue
  65. 1 1
      pages_category_page1/orderModule/platformJoin.vue
  66. 6 6
      pages_category_page1/search/index/index.vue
  67. 15 15
      pages_category_page1/store/index.vue
  68. 9 9
      pages_category_page2/channelCoupon/index.vue
  69. 3 3
      pages_category_page2/distributionModule/distributionOrder.vue
  70. 2 2
      pages_category_page2/livePage/components/liveBox.vue
  71. 1 1
      pages_category_page2/livePage/index.vue
  72. 3 3
      pages_category_page2/orderModule/afterSale.vue
  73. 9 9
      pages_category_page2/orderModule/refundDetails.vue
  74. 12 12
      pages_category_page2/orderModule/returnDetails.vue
  75. 3 3
      pages_category_page2/userModule/accountLogin.vue
  76. 3 3
      pages_category_page2/userModule/addAddress.vue
  77. 3 3
      pages_category_page2/userModule/address.vue
  78. 3 3
      pages_category_page2/userModule/bankcard.vue
  79. 3 3
      pages_category_page2/userModule/bindPhone.vue
  80. 20 20
      pages_category_page2/userModule/collection.vue
  81. 3 3
      pages_category_page2/userModule/coupon.vue
  82. 7 7
      pages_category_page2/userModule/footprintList.vue
  83. 1 1
      pages_category_page2/userModule/login.vue
  84. 4 4
      pages_category_page2/userModule/memberAccount.vue
  85. 8 10
      pages_category_page2/userModule/messageCenter.vue
  86. 1 1
      pages_category_page2/userModule/mobilePhone.vue
  87. 29 47
      pages_category_page2/userModule/personalDetails.vue
  88. 16 16
      pages_category_page2/userModule/questionList.vue
  89. 3 3
      pages_category_page2/userModule/register.vue
  90. 1 1
      pages_category_page2/userModule/withdraw.vue
  91. BIN
      static/assets/img/logo.png
  92. BIN
      static/assets/img/xian.png
  93. BIN
      static/images/accountBg.png
  94. BIN
      static/images/addBankBg.png
  95. BIN
      static/images/addCommentsIcon.png
  96. BIN
      static/images/addEdit.png
  97. BIN
      static/images/addImg.png
  98. BIN
      static/images/addImgBtn.png
  99. BIN
      static/images/addPraiseIcon.png
  100. BIN
      static/images/afterSaleClose.png

+ 11 - 1
.gitignore

@@ -9,7 +9,17 @@
 *.njsproj
 *.sln
 *.hbuilderx
-/unpackage
+/unpackage/dist/dev
+/unpackage/dist/static
+/unpackage/dist/build/mp-alipay/
+/unpackage/dist/build/mp-weixin/
+/unpackage/dist/build/app-plus/
+/unpackage/dist/build/.automator
+/unpackage/cache/
+/unpackage/cache/apk
+/unpackage/release
+/unpackage/res
+/unpackage/resources
 /node_modules
 package-lock.json
 

+ 5 - 5
component/share.vue

@@ -9,20 +9,20 @@
 						<!-- #ifndef MP -->
 						<!-- #ifndef APP -->
 						<view class="li" @click="share('weixin')">
-							<image class="icon" src="../static/images/weixin2x.png"></image>
+							<image class="icon" src="../static/images/share/weixin2x.png"></image>
 							<label class="label">微信</label>
 						</view>
 						<view class="li" @click="share('qq')">
-							<image class="icon" src="../static/images/qq2x.png"></image>
+							<image class="icon" src="../static/images/share/qq2x.png"></image>
 							<label class="label">QQ</label>
 						</view>
 						<view class="li" @click="share('weibo')">
-							<image class="icon" src="../static/images/weibo2x.png"></image>
+							<image class="icon" src="../static/images/share/weibo2x.png"></image>
 							<label class="label">微博</label>
 						</view>
 						<!-- #endif -->
 						<view class="li" @click="share('lianjie')">
-							<image class="icon" src="../static/images/lianjie.png"></image>
+							<image class="icon" src="../static/images/share/lianjie.png"></image>
 							<label class="label">链接</label>
 						</view>
 						<!-- #endif -->
@@ -181,7 +181,7 @@
 		.btn-close{
 			background-color: #fff;
 			padding: 30rpx 0;
-			font-size: 26px;
+			font-size: 26rpx;
 			color: #333;
 		}
 	}

+ 3 - 3
components/activities/combinedSales.vue

@@ -3,7 +3,7 @@
     <view class="group-warp">
       <view class="title">
         <label>
-          <image class="title-img" src="../../static/images/combinationIcon.png" alt="组合销售" mode="widthFix"></image>
+          <image class="title-img" src="https://ceres.zkthink.com/static/images/combinationIcon.png" alt="组合销售" mode="widthFix"></image>
         </label>
         <view class="price-text">
           组合价:¥{{composePrice}}
@@ -308,7 +308,7 @@ export default {
       addCart.push(shopObj)
       uni.setStorageSync('skuItemDTOList', addCart)
       uni.navigateTo({
-        url: '../../pages_category_page1/orderModule/orderConfirm?type=2'
+        url: '../../pages_category_page1/orderModule/orderConfirm?type=1'
       })
     },
     getselectedAttrVal(item){
@@ -434,7 +434,7 @@ export default {
           margin: 0 auto;
           line-height: 50upx;
           border: 2upx solid #E4E5E6;
-          background: url("../../static/images/arrow-suk-select.png") no-repeat right center / 60upx 60upx;
+          background: url("https://ceres.zkthink.com/static/images/arrow-suk-select.png") no-repeat right center / 60upx 60upx;
           .text{
             font-size: 24upx;
             color: #999;

+ 1 - 1
components/basics/categoryShow.vue

@@ -32,7 +32,7 @@
       </view>
     </view>
     <view v-else class="emptyCart-box flex-items-plus flex-column">
-        <image class="emptyCart-img" src="@/static/img/bgnull.png" mode="widthFix" />
+        <image class="emptyCart-img" src="https://ceres.zkthink.com/static/img/bgnull.png" mode="widthFix" />
         <label class="font-color-999 fs26 mar-top-30">这里空空如也~</label>
     </view>
   </view>

+ 1 - 1
components/canvasShow/basics/live/app/item.vue

@@ -55,7 +55,7 @@
         <view class="user-name">{{ liveData.anchorNickName }}</view>
       </view>
       <view class="count-down" v-if="liveStatus === 102">
-        <image v-if="isLate" class="img" src="@/static/img/live/live-late.png"/>
+        <image v-if="isLate" class="img" src="@/static/images/live/live-late.png"/>
         <view class="text">{{ liveTimeTitle }}</view>
         <view v-if="!isLate" class="time">
           <view class="time-item">{{times[0]}}</view>

BIN
components/canvasShow/static/images/discount/bg-discount-more.png


BIN
components/canvasShow/static/images/discount/bg-discount-top.png


+ 61 - 53
components/goodsDetalils/coupon-popup.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="coupon-popup" :class="showActivity && 'show'" >
-	<view class="mask" @click="closePopup"></view>  
+	<view class="mask" @click="closePopup"></view>
     <view class="couponShow-box" id="popupInner">
         <view class="tabsbox">
             <u-tabs
@@ -15,76 +15,80 @@
               @change="activeTypeActive"
             ></u-tabs>
         </view>
-        <view v-if="activeTypeFlag === 0" class="couponShow">
+        <view v-show="activeTypeFlag === 0">
+          <view class="couponShow">
             <view class="title-box">
-                <image class="close-btn" @click="onActivityClose" src="../../static/images/close.png"></image>
+              <image class="close-btn" @click="onActivityClose" src="https://ceres.zkthink.com/static/images/close.png"></image>
             </view>
             <view class="shopCouponBox" :class="markTools.length === 0 && 'flex'">
-                <view class="list" v-if="markTools.length > 0">
-                    <view class="item"
+              <view class="list" v-if="markTools.length > 0">
+                <view class="item"
                       v-for="(item, index) in markTools"
                       :key="index"
                       :class="{received: item.state === 1}"
-                    >
-                        <view class="info-box">
-                            <view class="discoun" v-if="item.couponType == 1"><text style="font-size: 28rpx">¥</text>{{item.reduceMoney}}</view>
-                            <view class="discoun" v-if="item.couponType == 2">{{item.reduceMoney}}折</view>
-                            <view class="info-date">{{getDate(item.startTime)}}-{{getDate(item.endTime)}}</view>
-                            <view class="info-condition mar-top-30">{{item.content}}</view>
-                            <!--                  <view class="info-condition" v-if="item.couponType == 2">{{item.reduceMoney}}折优惠</view>-->
-                            <wx-send-coupon @success="success" v-if="item.state === 3" :couponList="[item]">
-                                <view class="use-btn mar-top-10"
-                                      v-if="item.state === 3">
-                                    立即领取
-                                </view>
-                            </wx-send-coupon>
-                            <view class="use-btn mar-top-10" v-if="item.state === 0">已领取</view>
-                            <view class="use-btn mar-top-10" v-if="item.state === 1">已使用</view>
-                        </view>
-                    </view>
-                </view>
-                <view v-else class="emptyOrder-box flex-items-plus flex-column">
-                    <image class="emptyOrder-img" src="../../static/img/bgnull.png"></image>
-                    <label class="font-color-999 fs26 mar-top-30">你还没有优惠券哦~</label>
+                >
+                  <view class="info-box">
+                    <view class="discoun" v-if="item.couponType == 1"><text style="font-size: 28rpx">¥</text>{{item.reduceMoney}}</view>
+                    <view class="discoun" v-if="item.couponType == 2">{{item.reduceMoney}}折</view>
+                    <view class="info-date">{{getDate(item.startTime)}}-{{getDate(item.endTime)}}</view>
+                    <view class="info-condition mar-top-30">{{item.content}}</view>
+                    <!--                  <view class="info-condition" v-if="item.couponType == 2">{{item.reduceMoney}}折优惠</view>-->
+                    <wx-send-coupon @success="success" v-if="item.state === 3" :couponList="[item]">
+                      <view class="use-btn mar-top-10"
+                            v-if="item.state === 3">
+                        立即领取
+                      </view>
+                    </wx-send-coupon>
+                    <view class="use-btn mar-top-10" v-if="item.state === 0">已领取</view>
+                    <view class="use-btn mar-top-10" v-if="item.state === 1">已使用</view>
+                  </view>
                 </view>
+              </view>
+              <view v-else class="emptyOrder-box flex-items-plus flex-column">
+                <image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
+                <label class="font-color-999 fs26 mar-top-30">你还没有优惠券哦~</label>
+              </view>
             </view>
+          </view>
         </view>
-        <view v-if="activeTypeFlag === 1" class="couponShow">
+        <view v-show="activeTypeFlag === 1">
+          <view class="couponShow">
             <view class="title-box">
-                <image class="close-btn" @click="onActivityClose" src="../../static/images/close.png"></image>
+              <image class="close-btn" @click="onActivityClose" src="https://ceres.zkthink.com/static/images/close.png"></image>
             </view>
             <view class="shopCouponBox" :class="shopMarkTools.length === 0 && 'flex'">
-                <view class="list" v-if="shopMarkTools.length > 0">
-                    <view
-                      class="item"
-                      v-for="(item, index) in shopMarkTools"
-                      :key="index"
-                      :class="{received: item.state === 1}"
-                    >
-                        <view class="info-box">
-                            <view class="discoun" v-if="item.couponType === 1"><text
-                                    style="font-size: 28rpx">¥</text>{{item.reduceMoney}}</view>
-                            <view class="discoun" v-if="item.couponType === 2">{{item.reduceMoney}}折</view>
-                            <view class="info-date">{{getDate(item.startTime)}}-{{getDate(item.endTime)}}</view>
-                            <view class="info-condition" v-if="item.couponType === 1">
-                                满{{item.fullMoney}}元减{{item.reduceMoney}}元</view>
-                            <view class="info-condition" v-if="item.couponType === 2">{{item.reduceMoney}}折优惠
-                            </view>
-                            <view class="use-btn" @click="receiveTap(item,1)" v-if="item.state === 3">立即领取
-                            </view>
-                            <view class="use-btn" v-if="item.state === 0">已领取</view>
-                        </view>
+              <view class="list" v-if="shopMarkTools.length > 0">
+                <view
+                    class="item"
+                    v-for="(item, index) in shopMarkTools"
+                    :key="index"
+                    :class="{received: item.state === 1}"
+                >
+                  <view class="info-box">
+                    <view class="discoun" v-if="item.couponType === 1"><text
+                        style="font-size: 28rpx">¥</text>{{item.reduceMoney}}</view>
+                    <view class="discoun" v-if="item.couponType === 2">{{item.reduceMoney}}折</view>
+                    <view class="info-date">{{getDate(item.startTime)}}-{{getDate(item.endTime)}}</view>
+                    <view class="info-condition" v-if="item.couponType === 1">
+                      满{{item.fullMoney}}元减{{item.reduceMoney}}元</view>
+                    <view class="info-condition" v-if="item.couponType === 2">{{item.reduceMoney}}折优惠
                     </view>
+                    <view class="use-btn" @click="receiveTap(item,1)" v-if="item.state === 3">立即领取
+                    </view>
+                    <view class="use-btn" v-if="item.state === 0">已领取</view>
+                  </view>
                 </view>
-                <view v-else class="emptyOrder-box flex-items-plus flex-column">
-                    <image class="emptyOrder-img" src="../../static/img/bgnull.png"></image>
-                    <label class="font-color-999 fs26 mar-top-30">你还没有优惠券哦~</label>
-                </view>
+              </view>
+              <view v-else class="emptyOrder-box flex-items-plus flex-column">
+                <image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
+                <label class="font-color-999 fs26 mar-top-30">你还没有优惠券哦~</label>
+              </view>
             </view>
+          </view>
         </view>
         <view class="receive-success" v-if="isShowSuccess">
             <view class="success-box">
-                <image class="success-img" src="../../static/images/success_tu.png"></image>
+                <image class="success-img" src="https://ceres.zkthink.com/static/images/success_tu.png"></image>
                 <view class="text">领取成功</view>
             </view>
         </view>
@@ -225,6 +229,10 @@ export default {
 		z-index:1001;
 	}
     .couponShow-box{
+      .couponShow {
+        height: 1000rpx;
+        z-index: 333;
+      }
         width: 100%;
         height: auto;
         /*transform: translate3d(0px, 100%, 0px);*/

+ 1 - 1
components/hoteRecommed/index.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="hotTemplate" v-if="productList.length">
     <view class="evaluateIcon flex-items">
-      <image src="@/static/images/evaluateIcon.png"></image>
+      <image src="https://ceres.zkthink.com/static/images/evaluateIcon.png"></image>
       <text>热门推荐</text>
     </view>
     <view class="recommendList">

+ 1 - 1
components/modal/modal.vue

@@ -13,7 +13,7 @@
 			</view>
 			<view v-else>
 				<view class="flex-end-plus" @tap="handleClickCancel">
-					<!-- <image class="img" src="../../static/close@3x.png" mode=""></image> -->
+					<!-- <image class="img" src="https://ceres.zkthink.com/static/close@3x.png" mode=""></image> -->
 				</view>
 				<slot></slot>
 			</view>

+ 1 - 1
components/notice/notice.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="notice">
 		<view class="content">
-			<image src="../../static/assets/images/cereshop/notice.png" mode=""></image>
+			<image src="https://ceres.zkthink.com/static/assets/images/cereshop/notice.png" mode=""></image>
 			<swiper class="swiper" :circular="true" :autoplay="true" :vertical="true" :interval="3000" :duration="500">
 			    <swiper-item v-for="(item,index) in list" :key="item.noticeId">
 			        <view class="swiper-item uni-bg-red fs26 font-color-333 overflow" @tap="goToMesDetail(item)">{{item.noticeTitle}}</view>

+ 40 - 24
components/wx/wxSendCoupon.vue

@@ -54,6 +54,10 @@
                 type: Array,
                 default: ()=>[]
             },
+            isExchange: {
+                type: Boolean,
+                default: false
+            }
             // 卡券无法加询问
             // isConfirm: {
             //     type: Boolean,
@@ -97,34 +101,46 @@
                 if(this.successList.length > 0){
                     const res = uni.getStorageSync('storage_key'),token = res.token;
                     if (token) {
-                        if (this.couponList.length === 1 && this.couponList[0].ifCredit) {
-                            // 单个积分兑换的卡券去积分中心兑
-                            uni.navigateTo({
-                                url: `../integral/exchangeDetail?data=${JSON.stringify(this.couponList[0])}`
+                        if(this.isExchange){
+                            // 积分兑换
+                            let paramsData = {
+                                couponId: this.couponList[0].couponId,
+                                source: 3
+                            }
+                            NET.request(API.exchangeCoupon, paramsData, 'POST').then(res => {
+                                this.$emit('success')
                             })
+
                         } else {
-                            let params = []
-                            this.successList.forEach(item=>{
-                                params.push({
-                                    couponId: item.couponId,
-                                    couponCode: item.couponCode,
-                                    source: 1
+                            if (this.couponList.length === 1 && this.couponList[0].ifCredit) {
+                                // 单个积分兑换的卡券去积分中心兑
+                                uni.navigateTo({
+                                    url: `../integral/exchangeDetail?data=${JSON.stringify(this.couponList[0])}`
                                 })
-                            })
-                            // 领取优惠卷
-                            NET.request(API.takeBatchCoupon, params, 'POST').then(res => {
-                                if (res.code === '200') {
-                                    this.$emit('success')
-                                    this.$emit('closeAd')
-                                }
-                            }).catch(res => {
-                                if(res.data.code !== '200'){
-                                    uni.showToast({
-                                        title:res.data.message,
-                                        icon:"none"
+                            } else {
+                                let params = []
+                                this.successList.forEach(item=>{
+                                    params.push({
+                                        couponId: item.couponId,
+                                        couponCode: item.couponCode,
+                                        source: 1
                                     })
-                                }
-                            })
+                                })
+                                // 领取优惠卷
+                                NET.request(API.takeBatchCoupon, params, 'POST').then(res => {
+                                    if (res.code === '200') {
+                                        this.$emit('success')
+                                        this.$emit('closeAd')
+                                    }
+                                }).catch(res => {
+                                    if(res.data.code !== '200'){
+                                        uni.showToast({
+                                            title:res.data.message,
+                                            icon:"none"
+                                        })
+                                    }
+                                })
+                            }
                         }
                     } else {
                         uni.showToast({

+ 6 - 6
manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "cereshop",
-    "appid" : "__UNI__B79F1D2",
+    "appid" : "__UNI__FF9597B",
     "description" : "cereshop",
     "versionName" : "1.5.0",
     "versionCode" : 150,
@@ -129,16 +129,16 @@
         "component" : true,
         "permission" : {},
         "plugins" : {
-            // 卡券
-            "sendCoupon" : {
-                "version" : "latest",
-                "provider" : "wxf3f436ba9bd4be7b"
-            },
             // 直播
             "live-player-plugin" : {
                 // "version": "1.3.2", // 注意该直播组件最新版本号,微信开发者工具调试时可获取最新版本号
                 "version" : "latest",
                 "provider" : "wx2b03c6e691cd7370"
+            },
+            // 卡券
+            "sendCoupon" : {
+                "version" : "latest",
+                "provider" : "wxf3f436ba9bd4be7b"
             }
         }
     },

+ 8 - 8
pages.json

@@ -653,26 +653,26 @@
 		"selectedColor": "#333333",
 		"list": [{
 				"pagePath": "pages/tabbar/index/index",
-				"iconPath": "static/img/tabbar/home.png",
-				"selectedIconPath": "static/img/tabbar/homeactive.png",
+				"iconPath": "static/images/tabbar/home.png",
+				"selectedIconPath": "static/images/tabbar/homeactive.png",
 				"text": "首页"
 			},
 			{
 				"pagePath": "pages/tabbar/category/index",
-				"iconPath": "static/img/tabbar/fenlei.png",
-				"selectedIconPath": "static/img/tabbar/fenleiactive.png",
+				"iconPath": "static/images/tabbar/fenlei.png",
+				"selectedIconPath": "static/images/tabbar/fenleiactive.png",
 				"text": "分类"
 			},
 			{
 				"pagePath": "pages/tabbar/cart/index",
-				"iconPath": "static/img/tabbar/gouwuche.png",
-				"selectedIconPath": "static/img/tabbar/gouwucheactive.png",
+				"iconPath": "static/images/tabbar/gouwuche.png",
+				"selectedIconPath": "static/images/tabbar/gouwucheactive.png",
 				"text": "购物车"
 			},
 			{
 				"pagePath": "pages/tabbar/user/index",
-				"iconPath": "static/img/tabbar/wode.png",
-				"selectedIconPath": "static/img/tabbar/wodeactive.png",
+				"iconPath": "static/images/tabbar/wode.png",
+				"selectedIconPath": "static/images/tabbar/wodeactive.png",
 				"text": "我的",
 				"navigationBarBackgroundColor": "#333333",
 				"backgroundColor": "#333333",

+ 13 - 12
pages/tabbar/cart/index.vue

@@ -4,7 +4,7 @@
     <view v-if="dataList.length !== 0">
       <view class="cart-bg">
         <view class="cart-num-box">
-          <image src="../../../static/images/logoTop.png"></image>
+          <image src="https://ceres.zkthink.com/static/images/logoTop.png"></image>
           <text class="btn-box" @click="btnTypeClick(1)" v-if="btnType == 0">管理</text>
           <text class="btn-box" @click="btnTypeClick(0)" v-if="btnType == 1">完成</text>
         </view>
@@ -16,24 +16,24 @@
         <view class="itemBox" v-for="(item, index) in dataList" :key="item.shopId">
           <view class="item" v-if="item.skus.length !== 0">
             <view class="shop-box">
-              <image mode="aspectFill" v-if="item.selected === 1" src="../../../static/images/selectActive.png" class="cart-select-img" @click.stop="updateShopSel(index,0)"></image>
-              <image mode="aspectFill" v-else src="../../../static/images/selectEmpty.png" class="cart-select-img" @click.stop="updateShopSel(index,1)"></image>
+              <image mode="aspectFill" v-if="item.selected === 1" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img" @click.stop="updateShopSel(index,0)"></image>
+              <image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img" @click.stop="updateShopSel(index,1)"></image>
               <view class="shop-name-box" @click="goStore(index)">
-                <image src="../../../static/images/orderStoreIcon.png" class="shop-img"></image>
+                <image src="https://ceres.zkthink.com/static/images/orderStoreIcon.png" class="shop-img"></image>
                 <text class="shop-name">{{item.shopName}}</text>
-                <image src="../../../static/images/arrowRight.png" class="arrow-right-img"></image>
+                <image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="arrow-right-img"></image>
               </view>
             </view>
             <view class="rulesBox flex-items" v-if="item.currentRules.number">
-              <image class="mar-right-20" src="../../../static/images/zuheIcon.png"></image>
+              <image class="mar-right-20" src="https://ceres.zkthink.com/static/images/zuheIcon.png"></image>
               <view class="fs24 font-color-C83732">已满足【{{item.currentRules.price}}元任选{{item.currentRules.number}}件】!</view>
             </view>
             <view v-for="(skuItem, cIndex) in dataList[index].skus" class="product-list-box">
               <view class="pro-item" @click="goodsDateils(item.shopId,skuItem.productId,skuItem.skuId)">
                 <image mode="aspectFill" v-if="skuItem.selected == 1"
-                       src="../../../static/images/selectActive.png"
+                       src="https://ceres.zkthink.com/static/images/selectActive.png"
                        @click.stop="cartItemSel(index,cIndex,0)" class="cart-select-img"></image>
-                <image mode="aspectFill" v-else src="../../../static/images/selectEmpty.png"
+                <image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png"
                        @click.stop="cartItemSel(index,cIndex,1)" class="cart-select-img"></image>
                 <view class="pro-r">
                   <image :src="skuItem.image" class="pro-img"></image>
@@ -115,9 +115,9 @@
           <!-- #endif -->
           <view class="cart-bottom">
             <view class="left">
-              <image mode="aspectFill" v-if="isAllCheck" src="../../../static/images/selectActive.png"
+              <image mode="aspectFill" v-if="isAllCheck" src="https://ceres.zkthink.com/static/images/selectActive.png"
                      class="cart-select-img" @click="allSel(0)"></image>
-              <image mode="aspectFill" v-else src="../../../static/images/selectEmpty.png"
+              <image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png"
                      class="cart-select-img" @click="allSel(1)"></image>
               <text>全选</text>
             </view>
@@ -136,7 +136,7 @@
       </view>
     <!-- 购物车为空 -->
     <view v-if="isEmpty" class="emptyCart-box flex-items-plus flex-column">
-      <image class="emptyCart-img" src="../../../static/images/cartEmpty.png"></image>
+      <image class="emptyCart-img" src="https://ceres.zkthink.com/static/images/cartEmpty.png"></image>
       <label class="font-color-999 fs26 mar-top-30">你的购物车还没有宝贝哦</label>
       <label class="font-color-999 fs26 mar-top-10">快去首页选一个吧~</label>
       <view class="goToShopping" @click="goToShopping">去购物</view>
@@ -1290,8 +1290,9 @@ export default {
 
 		.cart-bottom-box-h5 {
 			position: fixed;
-			bottom: 100rpx;
+			bottom: 90rpx;
 			width: 100%;
+      z-index: 99;
 		}
 
 		.cart-bottom-box-app {

+ 4 - 4
pages/tabbar/category/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="header">
-			<image class="logo" src="@/static/assets/img/logo.png" mode="widthFix"></image>
+			<image class="logo" src="https://ceres.zkthink.com//assets/img/logo.png" mode="widthFix"></image>
 		</view>
 		<view class="content">
 			<!-- 分类中心 -->
@@ -13,9 +13,9 @@
 			<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">
-			  <image class="emptyOrder-img" src="../../../static/images/classRight.png"></image>
+			  <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="../../../static/images/classLeft.png"></image>
+			  <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">
@@ -26,7 +26,7 @@
 				</view>
 			</scroll-view>
 			<view v-if="ifEmpty" class="emptyOrder-box flex-items-plus flex-column">
-				<image class="emptyOrder-img" src="../../../static/img/bgnull.png"></image>
+				<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 				<label class="font-color-999 fs26 mar-top-30">该分类没有商品~</label>
 			</view>
 		</view>

+ 12 - 6
pages/tabbar/index/index.vue

@@ -3,22 +3,22 @@
     <!-- #ifdef MP-WEIXIN -->
     <view class="header weiXinBox" :style="{'padding-top': topHeight + 'px'}">
       <view class="topBox" :style="{'height': height + 'px'}">
-        <image class="logo" src="@/static/assets/img/logo.png" mode="widthFix"></image>
+        <image class="logo" src="https://ceres.zkthink.com/static/assets/img/logo.png" mode="widthFix"></image>
       </view>
     </view>
     <view class="wxBtnBg" :style="{'padding-top': (topHeight + height + 10) + 'px'}">
       <view class="weiXinBoxBtn" @click="searchPro">
-        <image class="search-icon" src="@/static/images/searchImg.png" mode="widthFix"></image>
+        <image class="search-icon" src="https://ceres.zkthink.com/static/images/searchImg.png" mode="widthFix"></image>
         <text>请输入您想要的宝贝</text>
       </view>
     </view>
     <!-- #endif -->
     <!-- #ifdef H5 || APP-PLUS -->
     <view class="header">
-      <view class="topBox">
-        <image class="logo" src="@/static/assets/img/logo.png" mode="widthFix"></image>
+      <view class="topBox topWap">
+        <image class="logo" src="https://ceres.zkthink.com/static/assets/img/logo.png" mode="widthFix"></image>
         <view class="search-btn" @click="searchPro">
-          <image class="search-icon" src="@/static/img/search.png" mode="widthFix"></image>
+          <image class="search-icon" src="https://ceres.zkthink.com/static/img/search.png" mode="widthFix"></image>
         </view>
       </view>
     </view>
@@ -28,7 +28,7 @@
 		<category-show v-else :categoryid="categoryid"></category-show>
     <ad-window ref="adWindow" :triggerCondition="1"></ad-window>
 		<view class="reachBottom" v-if="topLeft > 400">
-			<image class="reach-icon" src="@/static/img/reachBottom.png" mode="widthFix"></image>
+			<image class="reach-icon" src="https://ceres.zkthink.com/static/img/reachBottom.png" mode="widthFix"></image>
 			<text class="reach-text">这里到底了哦~~</text>
 		</view>
 	</div>
@@ -216,6 +216,12 @@
     font-weight: bold;
   }
 }
+.topWap {
+  padding-top: 60rpx;
+  .logo {
+    margin-top: 0 !important;
+  }
+}
 .terminal2 {}
 
 .terminal3 {}

+ 30 - 30
pages/tabbar/user/index.vue

@@ -1,15 +1,15 @@
 <template>
 	<view class="content">
 		<!-- 我的 -->
-		<image class="top-bg" src="../../../static/img/user/topBg.png"></image>
+		<image class="top-bg" src="https://ceres.zkthink.com/static/img/user/topBg.png"></image>
 		<view class="page-content">
 			<view class="user-info-box" @click="gologin" v-if="JSON.stringify(item) =='{}' ">
-				<image class="user-image" src="../../../static/img/user/morentouxiang.png" mode="widthFix"></image>
+				<image class="user-image" src="https://ceres.zkthink.com/static/img/user/morentouxiang.png" mode="widthFix"></image>
 				<view class="user-info">
 					<view class="user-logoin-title">点击登录</view>
 					<view class="user-logoin-lable">登录后享受更多权益~</view>
 				</view>
-				<image class="user-info-right" src="../../../static/img/user/back.png"></image>
+				<image class="user-info-right" src="https://ceres.zkthink.com/static/img/user/back.png"></image>
 				<view class="notice">
 					<view class="messNum" v-if="useritem.notRead>0">{{useritem.notRead}}</view>
 				</view>
@@ -17,7 +17,7 @@
 			<view class="user-info-box" v-else>
 				<image class="user-image" @click="goinfo" v-if="useritem.headImage" :src="useritem.headImage"
 					mode="widthFix" style="border-radius: 50%;"></image>
-				<image class="user-image" v-else src="../../../static/img/user/morentouxiang.png" mode="widthFix">
+				<image class="user-image" v-else src="https://ceres.zkthink.com/static/img/user/morentouxiang.png" mode="widthFix">
 				</image>
 				<view class="user-info">
 					<view class="user-logoin-title" v-if="useritem.name">{{useritem.name}}</view>
@@ -33,7 +33,7 @@
 			</view>
 			<view class="order-box">
 				<view class="order-item" @click="orderTap(1)">
-					<image class="order-item-image" src="../../../static/img/user/daifukuan1.png" mode="widthFix">
+					<image class="order-item-image" src="https://ceres.zkthink.com/static/img/user/daifukuan1.png" mode="widthFix">
 					</image>
 					<view class="order-item-text">待付款</view>
 					<view class="quan" v-if="useritem.waitPayOrderCount>0">
@@ -41,7 +41,7 @@
 					</view>
 				</view>
 				<view class="order-item" @click="orderTap(2)">
-					<image class="order-item-image" src="../../../static/img/user/daifahuo1.png" mode="widthFix">
+					<image class="order-item-image" src="https://ceres.zkthink.com/static/img/user/daifahuo1.png" mode="widthFix">
 					</image>
 					<view class="order-item-text">待发货</view>
 					<view class="quan" v-if="useritem.waitSendOrderCount>0">
@@ -50,7 +50,7 @@
 
 				</view>
 				<view class="order-item" @click="orderTap(3)">
-					<image class="order-item-image" src="../../../static/img/user/daishouhuo.png" mode="widthFix">
+					<image class="order-item-image" src="https://ceres.zkthink.com/static/img/user/daishouhuo.png" mode="widthFix">
 					</image>
 					<view class="order-item-text">待收货</view>
 					<view class="quan" v-if="useritem.waitReceiveOrderCount>0">
@@ -59,99 +59,99 @@
 
 				</view>
 				<view class="order-item" @click="orderTap(0)">
-					<image class="order-item-image" src="../../../static/img/user/dingdan.png" mode="widthFix"></image>
+					<image class="order-item-image" src="https://ceres.zkthink.com/static/img/user/dingdan.png" mode="widthFix"></image>
 					<view class="order-item-text">全部订单</view>
 				</view>
 			</view>
 			<!--			<view class="item-btn mt20" @click="toMessage">-->
-			<!--				<image class="item-btn-icon" src="../../../static/images/mymessageIcon.png" mode="widthFix"></image>-->
+			<!--				<image class="item-btn-icon" src="https://ceres.zkthink.com/static/images/mymessageIcon.png" mode="widthFix"></image>-->
 			<!--				<view class="item-btn-text flex-row-plus flex-items">-->
 			<!--					<label>消息中心</label>-->
 			<!--					<view class="messNum" v-if="useritem.notRead>0">{{useritem.notRead}}</view>-->
 			<!--				</view>-->
-			<!--				<image class="item-btn-right" src="../../../static/img/user/arrow.png" mode="widthFix"></image>-->
+			<!--				<image class="item-btn-right" src="https://ceres.zkthink.com/static/img/user/arrow.png" mode="widthFix"></image>-->
 			<!--			</view>-->
 			<view class="itemBox">
 				<view class="item-btn" @click="toCollection">
-					<image class="item-btn-icon" src="../../../static/img/user/mycollectionIcon.png" mode="widthFix">
+					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/mycollectionIcon.png" mode="widthFix">
 					</image>
 					<view class="item-btn-text">我的收藏</view>
 				</view>
 				<view class="item-btn" @click="toQuestion">
-					<image class="item-btn-icon" src="../../../static/img/user/myQuestionIcon.png" mode="widthFix">
+					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/myQuestionIcon.png" mode="widthFix">
 					</image>
 					<view class="item-btn-text">我的问答</view>
 				</view>
 				<view class="item-btn" @click="toFootprint">
-					<image class="item-btn-icon" src="../../../static/img/user/myfootprintIcon.png" mode="widthFix">
+					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/myfootprintIcon.png" mode="widthFix">
 					</image>
 					<view class="item-btn-text">浏览足迹</view>
 				</view>
 				<view class="item-btn" @click="gouserEvaluate">
-					<image class="item-btn-icon" src="../../../static/img/user/pingjia.png" mode="widthFix"></image>
+					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/pingjia.png" mode="widthFix"></image>
 					<view class="item-btn-text">我的评价</view>
 				</view>
 				<view class="item-btn" @click="memberAccountClick">
-					<image class="item-btn-icon" src="../../../static/img/user/account.png" mode="widthFix"></image>
+					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/account.png" mode="widthFix"></image>
 					<view class="item-btn-text">我的账户</view>
 				</view>
 				<view class="item-btn" @click="couponClick">
-					<image class="item-btn-icon" src="../../../static/img/user/kaquan.png" mode="widthFix"></image>
+					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/kaquan.png" mode="widthFix"></image>
 					<view class="item-btn-text">我的卡券</view>
 				</view>
 				<view class="item-btn" @click="godistribution">
-					<image class="item-btn-icon" src="../../../static/img/user/fenxiao.png" mode="widthFix"></image>
+					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/fenxiao.png" mode="widthFix"></image>
 					<view class="item-btn-text">分销中心</view>
 				</view>
 				<view class="item-btn" @click="applySettle">
-					<image class="item-btn-icon" src="../../../static/img/user/Settled.png" mode="widthFix"></image>
+					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/Settled.png" mode="widthFix"></image>
 					<view class="item-btn-text">商家入驻</view>
 				</view>
 			</view>
 			<view class="itemBox">
 				<view class="item-btn" @click="addressClick">
-					<image class="item-btn-icon" src="../../../static/img/user/dizhi1.png" mode="widthFix"></image>
+					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/dizhi1.png" mode="widthFix"></image>
 					<view class="item-btn-text">地址管理</view>
 				</view>
 				<view class="item-btn" @click="goafterSale">
-					<image class="item-btn-icon" src="../../../static/img/user/shouhou.png" mode="widthFix"></image>
+					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/shouhou.png" mode="widthFix"></image>
 					<view class="item-btn-text">我的售后</view>
 				</view>
 				<view class="item-btn" @click="goToMemberCenter">
-					<image class="item-btn-icon" src="../../../static/img/user/VIP.png" mode="widthFix"></image>
+					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/VIP.png" mode="widthFix"></image>
 					<view class="item-btn-text">会员中心</view>
 				</view>
 				<view class="item-btn" @click="goBankcard">
-					<image class="item-btn-icon" src="../../../static/img/user/kaquan.png" mode="widthFix"></image>
+					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/kaquan.png" mode="widthFix"></image>
 					<view class="item-btn-text">银行卡</view>
 				</view>
         <view class="item-btn" @click="goIntegral">
-          <image class="item-btn-icon" src="../../../static/img/user/myIntegral.png" mode="widthFix"></image>
+          <image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/myIntegral.png" mode="widthFix"></image>
           <view class="item-btn-text">我的积分</view>
         </view>
         <view class="item-btn" @click="goSign">
-          <image class="item-btn-icon" src="../../../static/img/user/signIcon.png" mode="widthFix"></image>
+          <image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/signIcon.png" mode="widthFix"></image>
           <view class="item-btn-text">签到</view>
         </view>
         <view class="item-btn" @click="goCouponList">
-          <image class="item-btn-icon" src="../../../static/img/user/userCouponIcon.png" mode="widthFix"></image>
+          <image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/userCouponIcon.png" mode="widthFix"></image>
           <view class="item-btn-text">优惠券</view>
         </view>
 				<!-- <view class="item-btn">
-						<image class="item-btn-icon" src="../../../static/img/user/service.png" mode="widthFix"></image>
+						<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/service.png" mode="widthFix"></image>
 						<view class="item-btn-text">平台客服</view>
 					</view> -->
 				<button open-type="contact" class="item-btn btnNone">
-					<image class="item-btn-icon" src="../../../static/img/user/service.png" mode="widthFix"></image>
+					<image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/service.png" mode="widthFix"></image>
 					<view class="item-btn-text">平台客服</view>
 				</button>
 
 				<!-- <view class="item-btn" @click="toSuccess">
-          <image class="item-btn-icon" src="../../../static/img/user/userCouponIcon.png" mode="widthFix"></image>
+          <image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/userCouponIcon.png" mode="widthFix"></image>
           <view class="item-btn-text">成功测试</view>
         </view> -->
 <!--        <view class="item-btn" @click="goWxShop">-->
-<!--          <image class="item-btn-icon" src="../../../static/img/user/kaquan.png" mode="widthFix"></image>-->
+<!--          <image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/kaquan.png" mode="widthFix"></image>-->
 <!--          <view class="item-btn-text">测试</view>-->
 <!--        </view>-->
 			</view>
@@ -507,7 +507,7 @@
 					position: absolute;
 					top: 0;
 					right: 50rpx;
-					background: url("../../../static/images/notice.png") no-repeat center center;
+					background: url("https://ceres.zkthink.com/static/images/notice.png") no-repeat center center;
 					background-size: contain;
 
 					.messNum {

+ 1 - 1
pages_category_page1/activity.vue

@@ -23,7 +23,7 @@
 							{{item.shopName}}
 						</view>
 						<view>
-							<image class="rightIcon" src="../static/images/arrowRight.png" mode="aspectFill"></image>
+							<image class="rightIcon" src="https://ceres.zkthink.com/images/arrowRight.png" mode="aspectFill"></image>
 						</view>
 					</view>
 				</view>

+ 7 - 3
pages_category_page1/coupon/list.vue

@@ -24,7 +24,7 @@
           </view>
           <view class="exchangeBtnBox flex-column flex-end">
             <view class="exchangeBtn fs24 font-color-FFF" v-if="item.state === 0">已领取</view>
-            <wx-send-coupon v-else @success="getCouponList" :couponList="[item]">
+            <wx-send-coupon v-else @success="success" :couponList="[item]">
               <view class="exchangeBtn fs24 font-color-FFF">{{item.ifCredit?'立即兑换':'立即领取'}}</view>
             </wx-send-coupon>
           </view>
@@ -34,7 +34,7 @@
     </view>
     <!-- 触底 -->
     <view class="reachBottom" v-if="topLeft > 400 && couponList.length>0">
-      <image class="reach-icon" src="@/static/img/reachBottom.png" mode="widthFix"></image>
+      <image class="reach-icon" src="https://ceres.zkthink.com/static/img/reachBottom.png" mode="widthFix"></image>
       <text class="reach-text">这里到底了哦~~</text>
     </view>
   </view>
@@ -98,6 +98,10 @@ export default {
       uni.navigateTo({
         url: `../coupon/product?id=${item.couponId}`
       })
+    },
+    success(){
+      this.page = 1
+      this.getCouponList()
     }
   }
 }
@@ -114,7 +118,7 @@ page {
       margin-top: 40rpx;
       padding: 25rpx 35rpx;
       overflow: hidden;
-      background-image: url("../../static/images/borderIcon.png");
+      background-image: url("https://ceres.zkthink.com/static/images/borderIcon.png");
       background-repeat: no-repeat;
       background-size: contain;
       background-position: right top;

+ 2 - 2
pages_category_page1/coupon/product.vue

@@ -2,7 +2,7 @@
   <view class="couponProduct">
     <view class="productList">
       <view class="couponTit flex-items">
-        <image src="../../static/images/counponTitIcon.png"></image>
+        <image src="https://ceres.zkthink.com/static/images/counponTitIcon.png"></image>
         <text class="fs24 font-color-C83732" v-if="currentCoupon.discountMode === 1">以下商品使用满{{currentCoupon.fullMoney}}元减{{currentCoupon.reduceMoney}}元的优惠券</text>
         <text class="fs24 font-color-C83732" v-else>以下商品使用满{{currentCoupon.fullMoney}}打{{currentCoupon.reduceMoney}}折</text>
       </view>
@@ -21,7 +21,7 @@
           </view>
         </view>
         <view v-if="ifEmpty" class="emptyOrder-box flex-items-plus flex-column">
-          <image class="emptyOrder-img" src="../../static/img/bgnull.png"></image>
+          <image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
           <label class="font-color-999 fs26 mar-top-30">暂无可用商品~</label>
         </view>
       </view>

+ 6 - 6
pages_category_page1/discount/discount.vue

@@ -23,8 +23,8 @@
         <view class="r">
           <view class="arrowUp" :class="{activeUp: type == 1}"></view>
           <view class="arrowDown" :class="{activeDown: type == 2}"></view>
-          <!--          <image src="../../static/images/arrowSortUp.png" v-if="type == 1" class="arrow-img padd-t"></image>-->
-          <!--          <image src="../../static/images/arrowSortDown.png" v-if="type == 2" class="arrow-img padd-b"></image>-->
+          <!--          <image src="https://ceres.zkthink.com/static/images/arrowSortUp.png" v-if="type == 1" class="arrow-img padd-t"></image>-->
+          <!--          <image src="https://ceres.zkthink.com/static/images/arrowSortDown.png" v-if="type == 2" class="arrow-img padd-b"></image>-->
         </view>
       </view>
       <view class="nav-item-sort" @click="sortTap(3)">
@@ -32,8 +32,8 @@
         <view class="r">
           <view class="arrowUp" :class="{activeUp: volume == 1}"></view>
           <view class="arrowDown" :class="{activeDown: volume == 2}"></view>
-          <!--          <image src="../../static/images/arrowSortUp.png" v-if="volume == 1" class="arrow-img padd-t"></image>-->
-          <!--          <image src="../../static/images/arrowSortDown.png" v-if="volume == 2" class="arrow-img padd-b"></image>-->
+          <!--          <image src="https://ceres.zkthink.com/static/images/arrowSortUp.png" v-if="volume == 1" class="arrow-img padd-t"></image>-->
+          <!--          <image src="https://ceres.zkthink.com/static/images/arrowSortDown.png" v-if="volume == 2" class="arrow-img padd-b"></image>-->
         </view>
       </view>
     </view>
@@ -50,7 +50,7 @@
           <view class="price">
             <view class="currentPrice flex-row-plus flex-items-plus font-color-FF7800">
               <view class="iconBox">
-                <image src="../../static/images/discountListIcon.png"></image>
+                <image src="https://ceres.zkthink.com/static/images/discountListIcon.png"></image>
               </view>
               <view class="flex-row-plus flex-items priceInfo">
                 <label class="fs24">¥</label>
@@ -294,7 +294,7 @@ page {
           height: 99rpx;
           line-height: 99rpx;
           text-align: center;
-          background: url("../../static/images/discountText.png") no-repeat center center;
+          background: url("https://ceres.zkthink.com/static/images/discountText.png") no-repeat center center;
           font-size: 28rpx;
           color: #FFFFFF;
           background-size: contain;

+ 3 - 3
pages_category_page1/discount/groupBuy.vue

@@ -1,7 +1,7 @@
 <template>
  <view class="groupBuy">
    <view class="groupBuyBg">
-     <image src="../../static/images/groupBuyLogo.png"></image>
+     <image src="https://ceres.zkthink.com/static/images/groupBuyLogo.png"></image>
    </view>
 	 <view class="countdown" v-if="shopShowType == false">
 	   距结束<view class="endDate"><span>{{hou}}</span><i>:</i><span>{{min}}</span><i>:</i><span>{{sec}}</span></view>
@@ -44,7 +44,7 @@
          <view class="price">
            <view class="currentPrice flex-row-plus flex-items-plus font-color-FF7800">
              <view class="iconBox">
-               <image src="../../static/images/groupBuyIcon.png"></image>
+               <image src="https://ceres.zkthink.com/static/images/groupBuyIcon.png"></image>
              </view>
              <view class="flex-row-plus flex-items priceInfo">
                <label class="fs24">¥</label>
@@ -61,7 +61,7 @@
        </view>
      </view>
      <view v-if="ifEmpty" class="emptyOrder-box flex-items-plus flex-column">
-       <image class="emptyOrder-img" src="../../static/img/bgnull.png"></image>
+       <image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
        <label class="font-color-999 fs26 mar-top-30">暂无活动商品~</label>
      </view>
    </view>

+ 7 - 7
pages_category_page1/discount/platformDiscount.vue

@@ -23,8 +23,8 @@
         <view class="r">
           <view class="arrowUp" :class="{activeUp: type == 1}"></view>
           <view class="arrowDown" :class="{activeDown: type == 2}"></view>
-          <!--          <image src="../../static/images/arrowSortUp.png" v-if="type == 1" class="arrow-img padd-t"></image>-->
-          <!--          <image src="../../static/images/arrowSortDown.png" v-if="type == 2" class="arrow-img padd-b"></image>-->
+          <!--          <image src="https://ceres.zkthink.com/static/images/arrowSortUp.png" v-if="type == 1" class="arrow-img padd-t"></image>-->
+          <!--          <image src="https://ceres.zkthink.com/static/images/arrowSortDown.png" v-if="type == 2" class="arrow-img padd-b"></image>-->
         </view>
       </view>
       <view class="nav-item-sort" @click="sortTap(3)">
@@ -32,8 +32,8 @@
         <view class="r">
           <view class="arrowUp" :class="{activeUp: volume == 1}"></view>
           <view class="arrowDown" :class="{activeDown: volume == 2}"></view>
-          <!--          <image src="../../static/images/arrowSortUp.png" v-if="volume == 1" class="arrow-img padd-t"></image>-->
-          <!--          <image src="../../static/images/arrowSortDown.png" v-if="volume == 2" class="arrow-img padd-b"></image>-->
+          <!--          <image src="https://ceres.zkthink.com/static/images/arrowSortUp.png" v-if="volume == 1" class="arrow-img padd-t"></image>-->
+          <!--          <image src="https://ceres.zkthink.com/static/images/arrowSortDown.png" v-if="volume == 2" class="arrow-img padd-b"></image>-->
         </view>
       </view>
     </view>
@@ -50,7 +50,7 @@
           <view class="price">
             <view class="currentPrice flex-row-plus flex-items-plus font-color-FF7800">
               <view class="iconBox">
-                <image src="../../static/images/discountListIcon.png"></image>
+                <image src="https://ceres.zkthink.com/static/images/discountListIcon.png"></image>
               </view>
               <view class="flex-row-plus flex-items priceInfo">
                 <label class="fs24">¥</label>
@@ -67,7 +67,7 @@
         </view>
       </view>
       <view v-if="ifEmpty" class="emptyOrder-box flex-items-plus flex-column">
-        <image class="emptyOrder-img" src="../../static/img/bgnull.png"></image>
+        <image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
         <label class="font-color-999 fs26 mar-top-30">暂无活动商品~</label>
       </view>
     </view>
@@ -324,7 +324,7 @@ page {
           height: 99rpx;
           line-height: 91rpx;
           text-align: center;
-          background: url("../../static/images/discountText.png") no-repeat center center;
+          background: url("https://ceres.zkthink.com/static/images/discountText.png") no-repeat center center;
           font-size: 28rpx;
           color: #FFFFFF;
           background-size: contain;

+ 2 - 2
pages_category_page1/discount/spikeList.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="spikeListBox">
     <view class="spikeBg">
-      <image src="../../static/images/spikelLogo.png"></image>
+      <image src="https://ceres.zkthink.com/static/images/spikelLogo.png"></image>
     </view>
     <view class="tabs-nav-warp spikeNav">
       <scroll-view class="tabs-nav" scroll-x="true">
@@ -29,7 +29,7 @@
           <view class="price">
             <view class="currentPrice flex-items font-color-FF7800">
 				<view class="iconBox flex-items">
-          <image src="../../static/images/spikeIcon.png"></image>
+          <image src="https://ceres.zkthink.com/static/images/spikeIcon.png"></image>
         </view>
 				<view class="flex-row-plus flex-items priceInfo">
 					<label class="fs24">¥</label>

+ 1 - 1
pages_category_page1/distributionModule/index.vue

@@ -24,7 +24,7 @@
 			</view>
 		</view>
 		<view v-if="ifEmpty" class="emptyCart-box flex-items-plus flex-column">
-			<image class="emptyCart-img" src="../../static/img/bgnull.png"></image>
+			<image class="emptyCart-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 			<label class="font-color-999 fs26 mar-top-30">这里空空如也~</label>
 		</view>
 	</view>

+ 5 - 5
pages_category_page1/distributionModule/invite.vue

@@ -5,11 +5,11 @@
 				<view class="rect" @tap.stop>
 					<!-- 关闭按钮 -->
 					<view class="guanbiBox">
-						<image @click="showcos" src="../../static/img/guanbi.png" class="guanbi" mode=""></image>
+						<image @click="showcos" src="https://ceres.zkthink.com/static/img/guanbi.png" class="guanbi" mode=""></image>
 					</view>
 					<!-- 内容 -->
 					<view>
-						<image src="../../static/img/banyuan.png" style="width: 100%;height: 44rpx;" mode=""></image>
+						<image src="https://ceres.zkthink.com/static/img/banyuan.png" style="width: 100%;height: 44rpx;" mode=""></image>
 					</view>
 					<view style="padding: 30rpx;">
 						<!-- 个人信息 -->
@@ -35,7 +35,7 @@
                 <p style="color: #666666;font-size: 22rpx;">来自「cereshop商城」小程序</p>
 							</view>
 							<view style="margin-left: 60rpx;" v-if="listitem.ifLogo">
-								<!-- <image src="../../static/img/user/morentouxiang.png" style="width: 118rpx;height: 118rpx;" mode=""></image> -->
+								<!-- <image src="https://ceres.zkthink.com/static/img/user/morentouxiang.png" style="width: 118rpx;height: 118rpx;" mode=""></image> -->
 								<view class="qrimg-i" @click="saveQrcode">
 									<tki-qrcode  cid="qrcode2" ref="qrcode2" :val="erweima" :size="size" :onval="onval" :loadMake="loadMake" :usingComponents="true" />
 								</view>
@@ -50,7 +50,7 @@
           <button open-type="share" >
             <view @click="WXfenx" style="flex: 1;text-align: center;display: flex;">
               <view style="margin-left: 120rpx;">
-                <image src="../../static/img/weixin2x.png" mode=""></image>
+                <image src="https://ceres.zkthink.com/static/img/weixin2x.png" mode=""></image>
               </view>
               <view style="margin-left: 10rpx;font-size: 28rpx;color: #333333">分享到微信</view>
             </view>
@@ -64,7 +64,7 @@
         <!--        </view>-->
         <view class="linkBtnBox" @click="FZlianj">
           <view class="linkBox">
-            <image src="../../static/img/lianjie.png" mode=""></image>
+            <image src="https://ceres.zkthink.com/static/img/lianjie.png" mode=""></image>
           </view>
           <view style="margin-left: 10rpx;">
             复制链接

+ 4 - 4
pages_category_page1/distributionModule/promotion.vue

@@ -4,10 +4,10 @@
 			<view class="warp">
 				<view class="rect" @tap.stop>
 					<!-- 关闭按钮 -->
-					<image @click="showcos" src="../../static/img/guanbi.png" class="guanbi" mode=""></image>
+					<image @click="showcos" src="https://ceres.zkthink.com/static/img/guanbi.png" class="guanbi" mode=""></image>
 					<!-- 内容 -->
 					<view>
-						<image src="../../static/img/banyuan.png" style="width: 100%;height: 44rpx;" mode=""></image>
+						<image src="https://ceres.zkthink.com/static/img/banyuan.png" style="width: 100%;height: 44rpx;" mode=""></image>
 					</view>
 					<view style="padding: 30rpx;">
 						<!-- 个人信息 -->
@@ -52,7 +52,7 @@
 					<button open-type="share">
 						<view @click="WXfenx" style="flex: 1;text-align: center;display: flex;">
 							<view style="margin-left: 120rpx;">
-								<image src="../../static/img/weixin2x.png" mode=""></image>
+								<image src="https://ceres.zkthink.com/static/img/weixin2x.png" mode=""></image>
 							</view>
 							<view style="margin-left: 10rpx;font-size: 28rpx;color: #333333">分享到微信</view>
 						</view>
@@ -66,7 +66,7 @@
 				<!--        </view>-->
 				<view class="linkBtnBox" @click="FZlianj">
 					<view class="linkBox">
-						<image src="../../static/img/lianjie.png" mode=""></image>
+						<image src="https://ceres.zkthink.com/static/img/lianjie.png" mode=""></image>
 					</view>
 					<view style="margin-left: 10rpx;">
 						复制链接

+ 1 - 1
pages_category_page1/distributionModule/recruit.vue

@@ -191,7 +191,7 @@
 		.topBackImg {
 			width: 100%;
 			height: 260upx;
-			background: url(../../static/images/storeTop_Img.png) no-repeat;
+			background: url(https://ceres.zkthink.com/static/images/storeTop_Img.png) no-repeat;
 			background-size: 100% 260upx;
 
 			.content {

+ 4 - 4
pages_category_page1/distributionModule/salesIndex.vue

@@ -41,19 +41,19 @@
 		<view class="btnList">
 			<view class="btnListBox flex-row-plus flex-items flex-sp-around">
 				<view class="flex-column-plus flex-items"  @click="gopromotion(1)">
-					<image class="salesIcon" src="../../static/images/salesStoreIcon.png"></image>
+					<image class="salesIcon" src="https://ceres.zkthink.com/static/images/salesStoreIcon.png"></image>
 					<label class="fs26 font-color-333">推广店铺</label>
 				</view>
 				<view class="flex-column-plus flex-items" @click="storeindex">
-					<image class="salesIcon" src="../../static/images/extendGoodsIcon.png"></image>
+					<image class="salesIcon" src="https://ceres.zkthink.com/static/images/extendGoodsIcon.png"></image>
 					<label class="fs26 font-color-333">推广商品</label>
 				</view>
 				<view class="flex-column-plus flex-items" @click="godistributionOrder">
-					<image class="salesIcon" src="../../static/images/salesOrderIcon.png"></image>
+					<image class="salesIcon" src="https://ceres.zkthink.com/static/images/salesOrderIcon.png"></image>
 					<label class="fs26 font-color-333">分销订单</label>
 				</view>
 				<view class="flex-column-plus flex-items" @click="gopromotion(2)">
-					<image class="salesIcon" src="../../static/images/inviteLowerIcon.png"></image>
+					<image class="salesIcon" src="https://ceres.zkthink.com/static/images/inviteLowerIcon.png"></image>
 					<label class="fs26 font-color-333">邀请下级</label>
 				</view>
 			</view>

+ 5 - 5
pages_category_page1/distributionModule/shareProduct.vue

@@ -6,10 +6,10 @@
 					<!-- 关闭按钮 -->
 					<view class="guanbiView">
             <!-- #ifdef MP-WEIXIN -->
-            <img @click="showcos" src="@../../static/img/guanbi.png" class="guanbi" style="width:30px;height:30px;" mode="widthFix"></img>
+            <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="@../../static/img/guanbi.png" class="guanbi" style="width:30px;height:30px;" mode="widthFix"></image>
+            <image @click="showcos" src="https://ceres.zkthink.com/static/img/guanbi.png" class="guanbi" style="width:30px;height:30px;" mode="widthFix"></image>
             <!-- #endif -->
 					</view>
 					<!-- 内容 -->
@@ -32,10 +32,10 @@
 				<view class="shareBox" :class="{'width100':noMp}" hover-class="btn-click" @click="WXfenx">
 					<view style="flex: 1;text-align: center;display: flex;">
 						<view style="margin-left: 120rpx;" v-if="noMp">
-							<image src="../../static/img/album.png" mode="widthFix"></image>
+							<image src="https://ceres.zkthink.com/static/img/album.png" mode="widthFix"></image>
 						</view>
 						<view style="margin-left: 35%;" v-else>
-							<image src="../../static/img/album.png" mode="widthFix"></image>
+							<image src="https://ceres.zkthink.com/static/img/album.png" mode="widthFix"></image>
 						</view>
 						<view style="margin-left: 10rpx;font-size: 28rpx;color: #333333">保存到本地</view>
 					</view>
@@ -43,7 +43,7 @@
 				<view class="linkBtnBox" hover-class="btn-click" @click="FZlianj" v-if="noMp">
 					<view style="flex: 1;text-align: center;display: flex;">
 						<view class="linkBox">
-							<image src="../../static/img/lianjie.png" mode="widthFix"></image>
+							<image src="https://ceres.zkthink.com/static/img/lianjie.png" mode="widthFix"></image>
 						</view>
 						<view style="margin-left: 10rpx;">
 							复制链接

+ 7 - 7
pages_category_page1/distributionModule/totalAward.vue

@@ -35,8 +35,8 @@
                 </view>
               </view>
               <view>
-                <image v-if="item.ifOpen  == false" class="arrow-down" src="../../static/images/arrowDownIcon.png"></image>
-                <image v-if="item.ifOpen  == true" class="arrow-down" src="../../static/images/arrowUpIcon.png"></image>
+                <image v-if="item.ifOpen  == false" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowDownIcon.png"></image>
+                <image v-if="item.ifOpen  == true" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowUpIcon.png"></image>
               </view>
             </view>
 						<view v-if="item.ifOpen  == true">
@@ -53,7 +53,7 @@
 				</view>
 			</view>
 			<view v-else class="emptyCart-box flex-items-plus flex-column">
-				<image class="emptyCart-img" src="../../static/img/bgnull.png"></image>
+				<image class="emptyCart-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 				<label class="font-color-999 fs26 mar-top-30">这里空空如也~</label>
 			</view>
 		</view>
@@ -69,8 +69,8 @@
                 </view>
               </view>
               <view>
-                <image v-if="item.ifOpen  == false" class="arrow-down" src="../../static/images/arrowDownIcon.png"></image>
-                <image v-if="item.ifOpen  == true" class="arrow-down" src="../../static/images/arrowUpIcon.png"></image>
+                <image v-if="item.ifOpen  == false" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowDownIcon.png"></image>
+                <image v-if="item.ifOpen  == true" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowUpIcon.png"></image>
               </view>
             </view>
 						<view v-if="item.ifOpen  == true">
@@ -91,7 +91,7 @@
 
 			</view>
 			<view v-else class="emptyCart-box flex-items-plus flex-column">
-				<image class="emptyCart-img" src="../../static/img/bgnull.png"></image>
+				<image class="emptyCart-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 				<label class="font-color-999 fs26 mar-top-30">这里空空如也~</label>
 			</view>
 		</view>
@@ -243,7 +243,7 @@ page {
 .totalAward-topBackImg {
   width: 100%;
   height: 360rpx;
-  background: url(../../static/images/unliquidatedBg.png) no-repeat;
+  background: url(https://ceres.zkthink.com/static/images/unliquidatedBg.png) no-repeat;
   background-size: 100%;
   margin-top: 30rpx;
   .totalAward-content {

+ 4 - 4
pages_category_page1/distributionModule/totalClient.vue

@@ -17,8 +17,8 @@
                 <label class="orderId-box font-color-999">客户昵称:{{item.customerName}}</label>
               </view>
             </view>
-            <image v-if="item.ifOpen == false" class="arrow-down" src="../../static/images/arrowDownIcon.png"></image>
-            <image v-if="item.ifOpen == true" class="arrow-down" src="../../static/images/arrowUpIcon.png"></image>topColor
+            <image v-if="item.ifOpen == false" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowDownIcon.png"></image>
+            <image v-if="item.ifOpen == true" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowUpIcon.png"></image>topColor
           </view>
           <view v-if="item.ifOpen == true">
             <view class="flex-row-plus flex-itdistributionOrderems mar-top-30 flex-sp-between">
@@ -33,7 +33,7 @@
       </view>
     </view>
     <view v-else class="emptyCart-box flex-items-plus flex-column">
-      <image class="emptyCart-img" src="../../static/img/bgnull.png"></image>
+      <image class="emptyCart-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
       <label class="font-color-999 fs26 mar-top-30">这里空空如也~</label>
     </view>
 	</view>
@@ -123,7 +123,7 @@ page {
   .topBg {
     width: 100%;
     height: 196upx;
-    background: url("../../static/images/totalPersonnelTopBackImg.png") no-repeat;
+    background: url("https://ceres.zkthink.com/static/images/totalPersonnelTopBackImg.png") no-repeat;
     margin-top: 50rpx;
     text-align: center;
   }

+ 4 - 4
pages_category_page1/distributionModule/totalPersonnel.vue

@@ -18,8 +18,8 @@
                 <label class="orderId-box font-color-999">手机号:{{item.distributorPhone}}</label>
               </view>
             </view>
-            <image v-if="item.ifOpen == false" class="arrow-down" src="../../static/images/arrowDownIcon.png"></image>
-            <image v-if="item.ifOpen == true" class="arrow-down" src="../../static/images/arrowUpIcon.png"></image>
+            <image v-if="item.ifOpen == false" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowDownIcon.png"></image>
+            <image v-if="item.ifOpen == true" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowUpIcon.png"></image>
           </view>
           <view v-if="item.ifOpen == true">
             <view class="flex-row-plus flex-itdistributionOrderems mar-top-30 flex-sp-between">
@@ -31,7 +31,7 @@
       </view>
     </view>
     <view v-else class="emptyCart-box flex-items-plus flex-column">
-      <image class="emptyCart-img" src="../../static/img/bgnull.png"></image>
+      <image class="emptyCart-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
       <label class="font-color-999 fs26 mar-top-30 font-color-999">这里空空如也~</label>
     </view>
 	</view>
@@ -119,7 +119,7 @@ page {
     .topBg {
       width: 100%;
       height: 196upx;
-      background: url("../../static/images/totalPersonnelTopBackImg.png") no-repeat;
+      background: url("https://ceres.zkthink.com/static/images/totalPersonnelTopBackImg.png") no-repeat;
       margin-top: 50rpx;
       text-align: center;
     }

+ 7 - 7
pages_category_page1/distributionModule/unliquidated.vue

@@ -36,8 +36,8 @@
                   </view>
                 </view>
                 <view>
-                  <image  v-if="item.ifOpen  == false" class="arrow-down" src="../../static/images/arrowDownIcon.png"></image>
-                  <image  v-if="item.ifOpen  == true" class="arrow-down" src="../../static/images/arrowUpIcon.png"></image>
+                  <image  v-if="item.ifOpen  == false" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowDownIcon.png"></image>
+                  <image  v-if="item.ifOpen  == true" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowUpIcon.png"></image>
                 </view>
               </view>
               <view v-if="item.ifOpen  == true">
@@ -53,7 +53,7 @@
           </view>
         </view>
         <view v-else class="emptyCart-box flex-items-plus flex-column">
-          <image class="emptyCart-img" src="../../static/img/bgnull.png"></image>
+          <image class="emptyCart-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
           <label class="font-color-999 fs26 mar-top-30">这里空空如也~</label>
         </view>
       </view>
@@ -69,8 +69,8 @@
                   </view>
                 </view>
                 <view>
-                  <image v-if="item.ifOpen  == false" class="arrow-down" src="../../static/images/arrowDownIcon.png"></image>
-                  <image v-if="item.ifOpen  == true" class="arrow-down" src="../../static/images/arrowUpIcon.png"></image>
+                  <image v-if="item.ifOpen  == false" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowDownIcon.png"></image>
+                  <image v-if="item.ifOpen  == true" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowUpIcon.png"></image>
                 </view>
               </view>
               <view v-if="item.ifOpen  == true">
@@ -89,7 +89,7 @@
           </view>
         </view>
         <view v-else class="emptyCart-box flex-items-plus flex-column">
-          <image class="emptyCart-img" src="../../static/img/bgnull.png"></image>
+          <image class="emptyCart-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
           <label class="font-color-999 fs26 mar-top-30">这里空空如也~</label>
         </view>
       </view>
@@ -240,7 +240,7 @@ page {
 	.unliquidated-topBackImg {
 		width: 100%;
 		height: 360rpx;
-		background: url(../../static/images/unliquidatedBg.png) no-repeat;
+		background: url(https://ceres.zkthink.com/static/images/unliquidatedBg.png) no-repeat;
 		background-size: 100%;
     margin-top: 30rpx;
 		.totalAward-content {

+ 1 - 1
pages_category_page1/goodsModule/addEvaluate.vue

@@ -204,7 +204,7 @@
   content: '';
   height: 71rpx;
   width: 71rpx;
-  background: url("../../static/images/addImg.png") no-repeat center center;
+  background: url("https://ceres.zkthink.com/static/images/addImg.png") no-repeat center center;
   display: block;
   background-size: contain;
 }

+ 15 - 15
pages_category_page1/goodsModule/canvasGoods.vue

@@ -4,9 +4,9 @@
     <!--		<view class="flex-items-plus flex-row search">-->
     <!--      <view class="searchBg">-->
     <!--        <view class="searchImg-box flex-items-plus">-->
-    <!--          <image class="searchImg" src="../../static/img/searchImg.png"></image>-->
+    <!--          <image class="searchImg" src="https://ceres.zkthink.com/static/img/searchImg.png"></image>-->
     <!--          <input class="search-box" v-model="keyWord" placeholder-class="searchboxPlace" placeholder="请输入您想要的宝贝" />-->
-    <!--&lt;!&ndash;          <image class="searchClose-icon" @click="searchTextDel" src="../../static/img/index/searchClose_icon.png"></image>&ndash;&gt;-->
+    <!--&lt;!&ndash;          <image class="searchClose-icon" @click="searchTextDel" src="https://ceres.zkthink.com/static/img/index/searchClose_icon.png"></image>&ndash;&gt;-->
     <!--        </view>-->
     <!--        <label class="mar-left-40 fs28" @click="searchList(1)">搜索</label>-->
     <!--      </view>-->
@@ -20,8 +20,8 @@
     <!--        <view class="r">-->
     <!--          <view class="arrowUp" :class="{activeUp: type == 1}"></view>-->
     <!--          <view class="arrowDown" :class="{activeDown: type == 2}"></view>-->
-    <!--          &lt;!&ndash;          <image src="../../static/images/arrowSortUp.png" v-if="type == 1" class="arrow-img padd-t"></image>&ndash;&gt;-->
-    <!--          &lt;!&ndash;          <image src="../../static/images/arrowSortDown.png" v-if="type == 2" class="arrow-img padd-b"></image>&ndash;&gt;-->
+    <!--          &lt;!&ndash;          <image src="https://ceres.zkthink.com/static/images/arrowSortUp.png" v-if="type == 1" class="arrow-img padd-t"></image>&ndash;&gt;-->
+    <!--          &lt;!&ndash;          <image src="https://ceres.zkthink.com/static/images/arrowSortDown.png" v-if="type == 2" class="arrow-img padd-b"></image>&ndash;&gt;-->
     <!--        </view>-->
     <!--      </view>-->
     <!--      <view class="nav-item-sort" @click="sortTap(3)">-->
@@ -29,8 +29,8 @@
     <!--        <view class="r">-->
     <!--          <view class="arrowUp" :class="{activeUp: volume == 1}"></view>-->
     <!--          <view class="arrowDown" :class="{activeDown: volume == 2}"></view>-->
-    <!--          &lt;!&ndash;          <image src="../../static/images/arrowSortUp.png" v-if="volume == 1" class="arrow-img padd-t"></image>&ndash;&gt;-->
-    <!--          &lt;!&ndash;          <image src="../../static/images/arrowSortDown.png" v-if="volume == 2" class="arrow-img padd-b"></image>&ndash;&gt;-->
+    <!--          &lt;!&ndash;          <image src="https://ceres.zkthink.com/static/images/arrowSortUp.png" v-if="volume == 1" class="arrow-img padd-t"></image>&ndash;&gt;-->
+    <!--          &lt;!&ndash;          <image src="https://ceres.zkthink.com/static/images/arrowSortDown.png" v-if="volume == 2" class="arrow-img padd-b"></image>&ndash;&gt;-->
     <!--        </view>-->
     <!--      </view>-->
     <!--    </view>-->
@@ -57,7 +57,7 @@
             </view>
             <view class="flex-display flex-sp-between flex-row mar-top-10 flex-items shopName">
               <label class="fs22 font-color-FFEBC4">{{item.shopName}}</label>
-              <!--							<image class="arrowImg" src="../../static/img/user/arrow.png"></image>-->
+              <!--							<image class="arrowImg" src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>-->
             </view>
           </view>
         </view>
@@ -73,12 +73,12 @@
                 <!--                <view class="numText" v-if="item.total !=0">限量{{item.total}}件</view>-->
               </view>
               <view class="flex-row-plus flex-item mar-top-30">
-                <image class="iconImg" v-if="item.activityType == 1" src="../../static/images/groupBuyIcon.png"></image>
-                <image class="iconImg" v-if="item.activityType == 2" src="../../static/images/spikeIcon.png"></image>
-                <image class="iconImg" v-if="item.activityType == 4" src="../../static/images/spikeIcon.png"></image>
-                <image class="iconImg" v-if="item.activityType == 3" src="../../static/images/discountListIcon.png"></image>
-                <image class="iconImg" v-if="item.activityType == 5" src="../../static/images/discountListIcon.png"></image>
-                <image class="iconImg" v-if="item.activityType == 8" src="../../static/images/memberCenterIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 1" src="https://ceres.zkthink.com/static/images/groupBuyIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 2" src="https://ceres.zkthink.com/static/images/spikeIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 4" src="https://ceres.zkthink.com/static/images/spikeIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 3" src="https://ceres.zkthink.com/static/images/discountListIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 5" src="https://ceres.zkthink.com/static/images/discountListIcon.png"></image>
+                <image class="iconImg" v-if="item.activityType == 8" src="https://ceres.zkthink.com/static/images/memberCenterIcon.png"></image>
                 <view class="font-color-C83732 flex-row-plus">
                   <b>¥</b>
                   <label class="fs28">{{item.price}}</label>
@@ -87,7 +87,7 @@
               </view>
               <view class="flex-display flex-sp-between flex-row mar-top-10 flex-items shopName">
                 <label class="fs22 font-color-FFEBC4">{{item.shopName}}</label>
-                <!--					  	<image class="arrowImg" src="../../static/img/user/arrow.png"></image>-->
+                <!--					  	<image class="arrowImg" src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>-->
               </view>
             </view>
           </view>
@@ -97,7 +97,7 @@
 
     <!-- 搜索为空 -->
     <view v-if="ifEmpty" class="emptyCart-box flex-items-plus flex-column">
-      <image class="emptyCart-img" src="../../static/images/searchEmpty.png"></image>
+      <image class="emptyCart-img" src="https://ceres.zkthink.com/static/images/searchEmpty.png"></image>
       <label class="font-color-999 fs26 mar-top-30">搜索不到你要找的宝贝呢</label>
       <label class="font-color-999 fs26 mar-top-10">换个词试试吧~</label>
     </view>

+ 3 - 3
pages_category_page1/goodsModule/combination.vue

@@ -20,8 +20,8 @@
           <view class="addInfo">
             <view class="price">¥{{item.price}}</view>
             <view class="selectBtn" @click.stop="showRuleBox(item, index)">
-              <image src="../../static/images/cart1.png" v-if="item.selected === 0"></image>
-              <image v-else src="../../static/images/cart2.png"></image>
+              <image src="https://ceres.zkthink.com/static/images/cart1.png" v-if="item.selected === 0"></image>
+              <image v-else src="https://ceres.zkthink.com/static/images/cart2.png"></image>
             </view>
           </view>
         </view>
@@ -372,7 +372,7 @@ page {
         height: 86rpx;
         line-height: 86rpx;
         text-align: center;
-        background: url("../../static/images/combinationBg.png") no-repeat center center;
+        background: url("https://ceres.zkthink.com/static/images/combinationBg.png") no-repeat center center;
         background-size: contain;
         overflow: hidden;
       }

+ 10 - 6
pages_category_page1/goodsModule/couponShopList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<!-- 商品列表 -->
-		<view v-if="list.length>0">
+		<view>
 			<view v-for="(item, index) in list" :key="index" class="goodsDetails-box flex-display flex-column mar-left-30" @click="goodsDateils(item.shopId,item.productId,item.skuId)">
 				<view v-if="item.activityType == 0" class="goodsDetails flex-items-plus flex-row mar-top-30">
 					<image class="goodsImg" :src="item.image"></image>
@@ -17,7 +17,7 @@
 						</view>
 						<view class="flex-display flex-sp-between flex-row mar-top-10 flex-items">
 							<label class="fs22 font-color-999">{{item.shopName}}</label>
-							<image class="arrowImg" src="../../static/img/user/arrow.png"></image>
+							<image class="arrowImg" src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
 						</view>
 					</view>
 				</view>
@@ -42,7 +42,7 @@
 					  </view>
 					  <view class="flex-display flex-sp-between flex-row mar-top-10 flex-items">
 					  	<label class="fs22 font-color-999">{{item.shopName}}</label>
-					  	<image class="arrowImg" src="../../static/img/user/arrow.png"></image>
+					  	<image class="arrowImg" src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
 					  </view>
 				    </view>
 				  </view>
@@ -51,8 +51,8 @@
 		</view>
 
 		<!-- 搜索为空 -->
-		<view v-else class="emptyCart-box flex-items-plus flex-column">
-			<image class="emptyCart-img" src="../../static/images/searchEmpty.png"></image>
+		<view v-if="ifShow" class="emptyCart-box flex-items-plus flex-column">
+			<image class="emptyCart-img" src="https://ceres.zkthink.com/static/images/searchEmpty.png"></image>
 			<label class="font-color-999 fs26 mar-top-30">无可用商品</label>
 		</view>
 	</view>
@@ -69,7 +69,8 @@
         activityId: null,
         shopCouponId: null,
 				list:[],
-				loadingType:0
+				loadingType:0,
+        ifShow: false
 			}
 		},
 		onLoad(option) {
@@ -101,6 +102,9 @@
 						}
 						uni.hideLoading()
 						this.list = this.list.concat(res.data.list)
+            if (this.list.length === 0) {
+              this.ifShow = true
+            }
 					}).catch(res => {
 						uni.hideLoading()
 					})

+ 1 - 1
pages_category_page1/goodsModule/evaSuccessful.vue

@@ -2,7 +2,7 @@
   <view class="payCourteous">
     <view class="evaBox">
       <view class="imgBox">
-        <image src="../../static/images/payIcon.png"></image>
+        <image src="https://ceres.zkthink.com/static/images/payIcon.png"></image>
       </view>
       <view class="successful">评价成功</view>
       <view class="btnBox fs28 font-color-333">

+ 1 - 1
pages_category_page1/goodsModule/evaluate.vue

@@ -254,7 +254,7 @@
   content: '';
   height: 71rpx;
   width: 71rpx;
-  background: url("../../static/images/addImg.png") no-repeat center center;
+  background: url("https://ceres.zkthink.com/static/images/addImg.png") no-repeat center center;
   display: block;
   background-size: contain;
 }

+ 4 - 4
pages_category_page1/goodsModule/evaluateDetails.vue

@@ -5,7 +5,7 @@
 			<view class="evaluate-content flex-items flex-row flex-sp-between">
 				<view class="flex-items">
 					<image class="user-headSmallImg" v-if="commentVOList.headImage" :src="commentVOList.headImage"></image>
-					<image class="user-headSmallImg" src="../../static/images/storeLogo.png" v-else ></image>
+					<image class="user-headSmallImg" src="https://ceres.zkthink.com/static/images/storeLogo.png" v-else ></image>
 					<label class="fs28 mar-left-20" v-if="commentVOList.name">{{commentVOList.name}}</label>
 					<label class="fs28 mar-left-20" v-else>匿名</label>
 				</view>
@@ -44,17 +44,17 @@
 		<view class="linkBox">
 			<view class="butBox flex-row-plus" v-if="commentVOList.addComment != ''">
 				<view class="addPraise-box1 flex-items-plus" @click="zanTap">
-					<image class="addPraise-icon" src="../../static/images/addPraiseIcon.png"></image>
+					<image class="addPraise-icon" src="https://ceres.zkthink.com/static/images/addPraiseIcon.png"></image>
 					<label class="mar-left-10 font-color-FFEBC4">点赞</label>
 				</view>
 			</view>
 			<view class="butBox flex-row-plus" v-else>
 				<view class="addComments-box flex-items-plus" @click="addCommentsClick()">
-					<image class="addComments-cion" src="../../static/images/addCommentsIcon.png"></image>
+					<image class="addComments-cion" src="https://ceres.zkthink.com/static/images/addCommentsIcon.png"></image>
 					<label class="mar-left-10 font-color-333">追加评价</label>
 				</view>
 				<view class="addPraise-box flex-items-plus" @click="zanTap">
-					<image class="addPraise-icon" src="../../static/images/addPraiseIcon.png"></image>
+					<image class="addPraise-icon" src="https://ceres.zkthink.com/static/images/addPraiseIcon.png"></image>
 					<label class="mar-left-10 font-color-FFEBC4">点赞</label>
 				</view>
 			</view>

+ 3 - 3
pages_category_page1/goodsModule/evaluateList.vue

@@ -37,10 +37,10 @@
 				<view class="praisebig-box flex-items mar-top-30 flex-sp-between">
           <text class="font-color-999 fs22">{{item.createTime}}</text>
 					<view class="praise-box flex-items flex-row">
-						<!-- <image class="praise-icon" src="../../static/images/praiseIcon.png"></image> -->
-						<image class="praise-icon" @click="zanTap(index,item.commen0tId,0)" src="../../static/images/praiseActiveIcon.png"
+						<!-- <image class="praise-icon" src="https://ceres.zkthink.com/static/images/praiseIcon.png"></image> -->
+						<image class="praise-icon" @click="zanTap(index,item.commen0tId,0)" src="https://ceres.zkthink.com/static/images/praiseActiveIcon.png"
 						 v-if="item.ifLike == 1"></image>
-						<image class="praise-icon" @click="zanTap(index,item.commentId,1)" src="../../static/images/praiseIcon.png" v-else></image>
+						<image class="praise-icon" @click="zanTap(index,item.commentId,1)" src="https://ceres.zkthink.com/static/images/praiseIcon.png" v-else></image>
 						<text class="mar-left-10 font-color-999">{{item.likes}}</text>
 					</view>
 				</view>

+ 25 - 29
pages_category_page1/goodsModule/goodsDetails.vue

@@ -9,7 +9,7 @@
 			</swiper>
 		</view>
 		<view class="share-box flex-items-plus" @click="clickShare">
-			<image class="share-img" src="../../static/images/shareBut.png"></image>
+			<image class="share-img" src="https://ceres.zkthink.com/static/images/shareBut.png"></image>
 			<label class="fs24 mar-left-5">分享</label>
 		</view>
 		<view class="goodgDes-box flex-start flex-column">
@@ -26,7 +26,7 @@
 			<view v-else class="seckill-box">
         <view class="flex-items flex-sp-between" v-if="selectedSku.activityType === 9">
           <view class="vipImg flex-items">
-            <image class="vip-icon" src="../../static/images/vipDetail.png" mode=""></image>
+            <image class="vip-icon" src="https://ceres.zkthink.com/static/images/vipDetail.png" mode=""></image>
           </view>
           <view class="flex-row-plus flex-items-plus mar-left-30 mar-top-10">
             <label class="fs30 font-color-FFF">¥</label>
@@ -37,11 +37,11 @@
 				<view v-else class="flex-items flex-row flex-sp-between">
 					<view class="flex-column-plus">
 						<image v-if="[2,4].includes(selectedSku.activityType)" class="seckill-icon"
-							src="../../static/images/seckillicon.png" mode=""></image>
+							src="https://ceres.zkthink.com/static/images/seckillicon.png" mode=""></image>
 						<image v-if="[3,5].includes(selectedSku.activityType)" class="discount-icon"
-							src="../../static/images/discounticon.png" mode=""></image>
+							src="https://ceres.zkthink.com/static/images/discounticon.png" mode=""></image>
 						<image v-if="selectedSku.activityType === 1" class="spell-icon"
-							src="../../static/images/spellicon.png" mode=""></image>
+							src="https://ceres.zkthink.com/static/images/spellicon.png" mode=""></image>
 						<view class="flex-row-plus flex-items mar-top-10">
 							<label class="fs30 font-color-FFF">¥</label>
 							<label class="fs42 mar-left-5 font-color-FFF">{{selectedSku.price || 0}}</label>
@@ -72,8 +72,8 @@
 				</view>
 				<view class="collectBox" @click="collectProduct">
 					<image v-if="productData.ifCollect === 1" class="store-icon"
-						src="../../static/images/shoucangActive1.png"></image>
-					<image v-else class="store-icon" src="../../static/images/shoucang2x.png"></image>
+						src="https://ceres.zkthink.com/static/images/shoucangActive1.png"></image>
+					<image v-else class="store-icon" src="https://ceres.zkthink.com/static/images/shoucang2x.png"></image>
 					<label class="fs22">收藏</label>
 				</view>
 			</view>
@@ -86,14 +86,14 @@
 					</view>
 					<view class="flex-items">
 						<label class="fs24 font-color-C5AA7B">领券</label>
-						<image class="coupon-arrow" src="../../static/img/user/arrow.png"></image>
+						<image class="coupon-arrow" src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="express-box flex-items flex-row fs24">
       <label class="fs24 font-color-999 mar-right-20">发货</label>
-      <image src="../../static/images/mapIcon.png" v-if="productData.receive && productData.receive.receiveAdress"></image>
+      <image src="https://ceres.zkthink.com/static/images/mapIcon.png" v-if="productData.receive && productData.receive.receiveAdress"></image>
       <label class="mar-left-10 mapName mar-right-30" v-if="productData.receive && productData.receive.receiveAdress">{{productData.receive.receiveAdress}}</label>
 			<label>快递:¥ {{productData.logisticsPrice || 0}}</label>
 		</view>
@@ -105,7 +105,7 @@
             <view class="mar-right-10" v-for="(item, index) of currentSuk" :key="index">{{item.skuText}}</view>
           </view>
 				</view>
-				<image class="arrow-icon" src="../../static/img/user/arrow.png"></image>
+				<image class="arrow-icon" src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
 			</view>
 		</view>
     <!--结合销售-->
@@ -118,7 +118,7 @@
 				<view class="allMoreBox">
 					<view v-if="topThreeCollageOrders.length > 0" class="allMore" @click="openAllBuy">查看全部</view>
 					<view v-else class="allMore" @click="openAllBuyTwo">查看全部</view>
-					<image class="evaluateAllArrow-icon mar-left-10" src="../../static/img/user/arrow.png"></image>
+					<image class="evaluateAllArrow-icon mar-left-10" src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
 				</view>
 			</view>
 			<view class="groupBuy" v-for="(Gitem, index) in topThreeCollageOrders" :key="index">
@@ -186,15 +186,15 @@
 				</view>
 				<view class="like-box">
 					<image class="like-img" @click="zanTap(index, commentItem.commentId,0)"
-						src="../../static/images/praiseActiveIcon.png" v-if="commentItem.ifLike === 1"></image>
+						src="https://ceres.zkthink.com/static/images/praiseActiveIcon.png" v-if="commentItem.ifLike === 1"></image>
 					<image class="like-img" @click="zanTap(index, commentItem.commentId,1)"
-						src="../../static/images/praiseIcon.png" v-else></image>
+						src="https://ceres.zkthink.com/static/images/praiseIcon.png" v-else></image>
 					<view class="like-num">{{commentItem.likes}}</view>
 				</view>
 			</view>
 			<view class="moreBox" v-if="commentListLength>0" @click="commentAll">
 				<label class="fs24">查看全部</label>
-				<image class="evaluateAllArrow-icon mar-left-10" src="../../static/img/user/arrow.png"></image>
+				<image class="evaluateAllArrow-icon mar-left-10" src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
 			</view>
 		</view>
 		<!--    评价END-->
@@ -232,7 +232,7 @@
 				</view>
         <view class="moreBox" v-if="problemsListLength>0" @click="seeAllQa">
           <label class="fs24">查看全部</label>
-          <image class="evaluateAllArrow-icon mar-left-10" src="../../static/img/user/arrow.png"></image>
+          <image class="evaluateAllArrow-icon mar-left-10" src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
         </view>
 			</view>
 		</view>
@@ -267,18 +267,18 @@
 			<view class="buygoodsBut-box flex-row-plus" :style="{'height':(isIphone === true? 160:130)+'rpx'}">
 				<view class="btns_container">
 					<view class="btns flex-column-plus" @click="goStore">
-						<image class="store-icon" src="../../static/images/storeIcon.png"></image>
+						<image class="store-icon" src="https://ceres.zkthink.com/static/images/storeIcon.png"></image>
 						<label class="fs22">店铺</label>
 					</view>
 					<!-- #ifdef MP-WEIXIN -->
 					<view v-if="hasService" class="btns flex-column-plus mar-left-10" @click="flyToService">
-						<image class="store-icon" src="../../static/images/service-product-detail.png"></image>
+						<image class="store-icon" src="https://ceres.zkthink.com/static/images/service-product-detail.png"></image>
 						<label class="fs22">客服</label>
 					</view>
 					<!-- #endif -->
 					<view class="btns flex-column-plus mar-left-10 flex-items Cart" @click="goshopCart">
 						<view class="cartAllNum" v-if="allCartNum>0">{{allCartNum}}</view>
-						<image class="store-icon" src="../../static/images/gouwuche.png"></image>
+						<image class="store-icon" src="https://ceres.zkthink.com/static/images/gouwuche.png"></image>
 						<label class="fs22">购物车</label>
 					</view>
 				</view>
@@ -300,7 +300,7 @@
 		<view class="returnTopService-box">
 			<view class="returnTop-box flex-items-plus flex-column" @click="top"
 				:style="{'display':(returnTopFlag===true? 'flex':'none')}">
-				<image class="returnTopImg" src="../../static/images/backTop.png"></image>
+				<image class="returnTopImg" src="https://ceres.zkthink.com/static/images/backTop.png"></image>
 			</view>
 		</view>
 		<!-- 商品详情 -->
@@ -1412,7 +1412,7 @@ export default {
 			})
 		},
 		getServiceUrl() {
-			if (this.isLoading) { return }
+			if (this.isLoading || !this.shopId || this.shopId === 'null') { return }
 			const shopids = uni.getStorageSync('service_shopids') || []
 			const corpIds = uni.getStorageSync('service_corpIds') || []
 			const urls = uni.getStorageSync('service_urls') || []
@@ -1759,7 +1759,7 @@ export default {
 						content: '';
 						width: 60rpx;
 						height: 60rpx;
-						background: url("../../static/images/arrow.png") no-repeat center center;
+						background: url("https://ceres.zkthink.com/static/images/arrow.png") no-repeat center center;
 						background-size: contain;
 						display: block;
 						position: absolute;
@@ -1946,7 +1946,7 @@ export default {
 					content: '';
 					width: 60rpx;
 					height: 60rpx;
-					background: url("../../static/images/arrow.png") no-repeat center center;
+					background: url("https://ceres.zkthink.com/static/images/arrow.png") no-repeat center center;
 					background-size: contain;
 					display: block;
 					position: absolute;
@@ -2137,7 +2137,7 @@ export default {
 					width: 36upx;
 					height: 36upx;
 					display: block;
-					background: url("../../static/images/serviceImg.png") no-repeat center center;
+					background: url("https://ceres.zkthink.com/static/images/serviceImg.png") no-repeat center center;
 					background-size: contain;
 				}
 			}
@@ -2350,15 +2350,12 @@ export default {
 		}
 
 		.couponShow-box {
-
 			.couponShow {
 				z-index: 333;
-				height: 1000upx;
-
+				height: 1000rpx;
 				.couponTitle-box {
 					width: 100%;
 				}
-
 				.coupon-title-active {
 					color: #FF7700;
 					border-bottom: 2upx solid #FF7700;
@@ -2387,7 +2384,6 @@ export default {
 					}
 				}
 			}
-
 		}
 
 		.succeedShow-box {
@@ -2626,7 +2622,7 @@ export default {
 
 	.seckill-box {
 		width: 100%;
-		background: url("../../static/images/storeTop_Img.png") no-repeat left top;
+		background: url("https://ceres.zkthink.com/static/images/storeTop_Img.png") no-repeat left top;
 		padding: 35rpx 30rpx;
 
 		.seckill-icon {

+ 9 - 9
pages_category_page1/goodsModule/goodsList.vue

@@ -4,7 +4,7 @@
 		<view class="flex-items-plus flex-row search">
       <view class="searchBg">
         <view class="searchImg-box flex-items-plus">
-          <image class="searchImg" src="../../static/img/searchImg.png"></image>
+          <image class="searchImg" src="https://ceres.zkthink.com/static/img/searchImg.png"></image>
           <input class="search-box" v-model="keyWord" placeholder-class="searchboxPlace" placeholder="请输入您想要的宝贝" />
         </view>
         <label class="mar-left-40 fs28" @click="searchList(1)">搜索</label>
@@ -43,12 +43,12 @@
                 <view class="numText" v-if="item.total !=0 && item.activityType !== 0">限量{{item.total}}件</view>
               </view>
 					  <view class="flex-row-plus flex-item mar-top-30">
-              <image class="iconImg" v-if="item.activityType == 1" src="../../static/images/groupBuyIcon.png"></image>
-              <image class="iconImg" v-if="item.activityType == 2" src="../../static/images/spikeIcon.png"></image>
-              <image class="iconImg" v-if="item.activityType == 4" src="../../static/images/spikeIcon.png"></image>
-              <image class="iconImg" v-if="item.activityType == 3" src="../../static/images/discountListIcon.png"></image>
-              <image class="iconImg" v-if="item.activityType == 5" src="../../static/images/discountListIcon.png"></image>
-              <image class="iconImg" v-if="item.activityType == 9" src="../../static/images/memberCenterIcon.png"></image>
+              <image class="iconImg" v-if="item.activityType == 1" src="https://ceres.zkthink.com/static/images/groupBuyIcon.png"></image>
+              <image class="iconImg" v-if="item.activityType == 2" src="https://ceres.zkthink.com/static/images/spikeIcon.png"></image>
+              <image class="iconImg" v-if="item.activityType == 4" src="https://ceres.zkthink.com/static/images/spikeIcon.png"></image>
+              <image class="iconImg" v-if="item.activityType == 3" src="https://ceres.zkthink.com/static/images/discountListIcon.png"></image>
+              <image class="iconImg" v-if="item.activityType == 5" src="https://ceres.zkthink.com/static/images/discountListIcon.png"></image>
+              <image class="iconImg" v-if="item.activityType == 9" src="https://ceres.zkthink.com/static/images/memberCenterIcon.png"></image>
 							<view class="font-color-C83732 flex-row-plus">
 								<b>¥</b>
 								<label class="fs28">{{item.price}}</label>
@@ -66,13 +66,13 @@
 
 		<!-- 搜索为空 -->
 		<view v-if="ifEmpty" class="emptyCart-box flex-items-plus flex-column">
-			<image class="emptyCart-img" src="../../static/images/searchEmpty.png"></image>
+			<image class="emptyCart-img" src="https://ceres.zkthink.com/static/images/searchEmpty.png"></image>
 			<label class="font-color-999 fs26 mar-top-30">搜索不到你要找的宝贝呢</label>
 			<label class="font-color-999 fs26 mar-top-10">换个词试试吧~</label>
 		</view>
 
 		<view class="reachBottom" v-if="topLeft > 400 && list.length > 0">
-			<image class="reach-icon" src="@/static/img/reachBottom.png" mode="widthFix"></image>
+			<image class="reach-icon" src="https://ceres.zkthink.com/static/img/reachBottom.png" mode="widthFix"></image>
 			<text class="reach-text">这里到底了哦~~</text>
 		</view>
 	</view>

+ 47 - 31
pages_category_page1/goodsModule/inviteSpell.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="inviteSpell-con">
     <view class="grouped">
-      <view class="fs32 font-color-FFF">等待成团</view>
+      <view class="fs32 font-color-FFF">{{remainPerson !== 0?'等待成团':'已成团'}}</view>
       <view class="fs26 number">{{inviteSpell.person}}人团</view>
     </view>
     <view class="topBox">
@@ -19,7 +19,7 @@
               </view>
             </view>
 <!--            <view class="mar-top-20">-->
-<!--              <image class="issueregiment" src="../../static/images/issueregiment.png"></image>-->
+<!--              <image class="issueregiment" src="https://ceres.zkthink.com/static/images/issueregiment.png"></image>-->
 <!--            </view>-->
           </view>
         </view>
@@ -37,10 +37,14 @@
             <view class="replenish-icon flex-items-plus mar-left-20">?</view>
           </view>
         </view>
-        <view class="mar-top-50 font-color-333">还差<label class="font-color-C5AA7B">{{remainPerson}}</label>人成团,距结束还剩{{hou}}:{{min}}:{{sec}}</view>
-        <view v-if="type == 1" @click="shareClick" class="offered-but font-color-FFF flex-items-plus mar-top-60">邀请好友拼单</view>
-        <view v-if="type == 0" @click="getOffered" class="offered-but font-color-FFF flex-items-plus mar-top-60">立即参团</view>
-        <view v-if="type == 1" @click="goinvitePoster" class="poster-but flex-items-plus mar-top-40">生成邀请海报</view>
+		  <view v-if="remainPerson !== 0">
+			  <view class="mar-top-50 font-color-333">还差<label class="font-color-C5AA7B">{{remainPerson}}</label>人成团,距结束还剩{{hou}}:{{min}}:{{sec}}</view>
+			  <view v-if="type == 1" @click="shareClick" class="offered-but font-color-FFF flex-items-plus mar-top-60">邀请好友拼单</view>
+			  <view v-if="type == 0" @click="getOffered" class="offered-but font-color-FFF flex-items-plus mar-top-60">立即参团</view>
+			  <view v-if="type == 1" @click="goinvitePoster" class="poster-but flex-items-plus mar-top-40">生成邀请海报</view>
+		  </view>
+
+
       </view>
 		</view>
 		<view class="spellrule flex-items-plus flex-column mar-top-20">
@@ -146,6 +150,7 @@
 				shopId:0,
 				attrList: [],
 				productDetail:{},
+				userInfo: {},
 				url:'',
 				shareTitle: ''
 			};
@@ -190,42 +195,47 @@
 			    clearTimeout(this.timeOut)
 			}
 		},
+		onShow(){
+            //判断是否登录
+			let item = {}
+			if(uni.getStorageSync('storage_key')){
+				item = uni.getStorageSync('storage_key');
+			}
+			if(JSON.stringify(item) == '{}'){
+				let data = {
+					collageId : this.collageId,
+					orderId : this.orderId,
+					productId : this.productId,
+					skuId : this.skuId,
+					type : this.type,
+				}
+				uni.setStorageSync("inviteSpell",data)
+				// uni.navigateTo({
+				// 	url:'../../pages_category_page2/userModule/accountLogin?inviteSpell=1'
+				// })
+			}else{
+				this.userInfo = uni.getStorageSync('storage_userInfo')
+			}
+			this.getInviteSpell()
+		},
 		onLoad(options) {
+			console.log(options,'options')
 			this.isIphone = getApp().globalData.isIphone;
 			this.collageId = parseInt(options.collageId)
 			this.orderId = parseInt(options.orderId)
 			this.productId = parseInt(options.productId)
 			this.skuId = parseInt(options.skuId)
-			this.type = parseInt(options.type)
+			// this.type = parseInt(options.type)
 			this.shopGroupWorkId = parseInt(options.shopGroupWorkId)
-			this.getInviteSpell()
+
 			this.getProductSku()
 			this.queryProductDetail()
 			this.url = '/pages_category_page1/goodsModule/inviteSpell?collageId='
-					+ this.collageId +'&orderId='+ this.orderId+'&type=0'+'&productId='+this.productId+'&skuId='+this.skuId+'&shopGroupWorkId='+this.shopGroupWorkId
+					+ this.collageId +'&orderId='+ this.orderId+'&productId='+this.productId+'&skuId='+this.skuId+'&shopGroupWorkId='+this.shopGroupWorkId
 		},
 		methods:{
 			getOffered(){
-				//判断是否登录
-				let item = {}
-				if(uni.getStorageSync('storage_key')){
-					item = uni.getStorageSync('storage_key');
-				}
-				if(JSON.stringify(item) == '{}'){
-					let data = {
-						collageId : this.collageId,
-						orderId : this.orderId,
-						productId : this.productId,
-						skuId : this.skuId,
-						type : this.type,
-					}
-					uni.setStorageSync("inviteSpell",data)
-					uni.navigateTo({
-						url:'../../pages_category_page2/userModule/accountLogin?inviteSpell=1'
-					})
-				}else{
-					this.goosDetailshowFlag = true
-				}
+
 			},
 			//拼团下单
 			getGroupSettlement(type){
@@ -380,7 +390,7 @@
 			},
 			getInviteSpell(){
 				uni.showLoading({
-          mask: true,
+                  mask: true,
 				  title: '加载中...',
 				})
 				NET.request(API.getInviteSpell, {
@@ -388,6 +398,12 @@
 					orderId: this.orderId
 				}, 'POST').then(res => {
 					this.inviteSpell = res.data
+					this.type = 0
+					this.inviteSpell.personList.forEach(item=>{
+						if(item.name === this.userInfo.name){
+							this.type = 1
+						}
+					})
 					this.personLen = res.data.personList.length
 					this.remainPerson = res.data.person - this.personLen
 					this.dateformat(res.data.time)
@@ -465,7 +481,7 @@ page{background-color: #F7F7F7;}
 	flex-direction: column;
 }
 .inviteSpell-con{
-  background: url("../../static/images/pintuanbg.png") no-repeat left top;
+  background: url("https://ceres.zkthink.com/static/images/pintuanbg.png") no-repeat left top;
   background-size: contain;
   .grouped {
     text-align: center;

+ 2 - 2
pages_category_page1/goodsModule/putQuestions.vue

@@ -15,8 +15,8 @@
       </view>
       <view class="anonymous">
 		  <view class="flex-row-plus flex-items" @click="changeCheck">
-			 <image mode="aspectFill" v-if="anonymous == true" src="../../static/images/selectActive.png" class="cart-select-img"></image>
-			 <image mode="aspectFill" v-else src="../../static/images/selectEmpty.png" class="cart-select-img"></image>
+			 <image mode="aspectFill" v-if="anonymous == true" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"></image>
+			 <image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img"></image>
 			 <label>匿名提问</label>
 		  </view>
       </view>

+ 8 - 8
pages_category_page1/goodsModule/userEvaluate.vue

@@ -23,7 +23,7 @@
 					<view class="evaluate-content flex-items flex-row flex-sp-between">
 						<view class="flex-items">
 							<image class="user-headSmallImg" v-if="item.headImage" :src="item.headImage"></image>
-							<image class="user-headSmallImg" src="../../static/images/storeLogo.png" v-else></image>
+							<image class="user-headSmallImg" src="https://ceres.zkthink.com/static/images/storeLogo.png" v-else></image>
               <view class="skuValue">
                 <label class="fs28" v-if="item.name">{{item.name}}</label>
                 <label class="fs28" v-else>匿名</label>
@@ -63,9 +63,9 @@
           <view class="flex-items flex-row mar-top-30 flex-sp-between">
             <view class="font-color-999 fs22">{{item.createTime}}</view>
             <view class="praise-box flex-items flex-row">
-              <image class="praise-icon" @click.stop="zanTap(index,item.commentId,0)" src="../../static/images/praiseActiveIcon.png"
+              <image class="praise-icon" @click.stop="zanTap(index,item.commentId,0)" src="https://ceres.zkthink.com/static/images/praiseActiveIcon.png"
                      v-if="item.ifLike"></image>
-              <image class="praise-icon" @click.stop="zanTap(index,item.commentId,1)" src="../../static/images/addPraiseIcon.png"
+              <image class="praise-icon" @click.stop="zanTap(index,item.commentId,1)" src="https://ceres.zkthink.com/static/images/addPraiseIcon.png"
                      v-else></image>
               <label class="mar-left-10">{{item.likes}}</label>
             </view>
@@ -73,7 +73,7 @@
 				</view>
 			</template>
 			<view v-if="evaluateEmpty" class="emptyOrder-box flex-items-plus flex-column">
-				<image class="emptyOrder-img" src="../../static/img/bgnull.png"></image>
+				<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 				<label class="font-color-999 fs26 mar-top-30">你还没有评论哦~</label>
 			</view>
 		</view>
@@ -87,7 +87,7 @@
 				<view class="evaluate-content flex-column" @click="commentDetails(index)" >
 					<view class="flex-items">
 						<image class="user-headSmallImg" v-if="item.headImage" :src="item.headImage"></image>
-						<image class="user-headSmallImg" src="../../static/images/storeLogo.png" v-else></image>
+						<image class="user-headSmallImg" src="https://ceres.zkthink.com/static/images/storeLogo.png" v-else></image>
 						<label class="fs28 mar-left-20" v-if="item.name">{{item.name}}</label>
 						<label class="fs28 mar-left-20" v-else>匿名</label>
 					</view>
@@ -113,9 +113,9 @@
 					<view class="flex-items flex-row mar-top-30 flex-sp-between">
             <view class="font-color-999 fs22">{{item.createTime}}</view>
 						<view class="praise-box flex-items flex-row">
-							<image class="praise-icon" @click.stop="zanTap(index,item.commentId,0)" src="../../static/images/praiseActiveIcon.png"
+							<image class="praise-icon" @click.stop="zanTap(index,item.commentId,0)" src="https://ceres.zkthink.com/static/images/praiseActiveIcon.png"
 							 v-if="item.ifLike"></image>
-							<image class="praise-icon" @click.stop="zanTap(index,item.commentId,1)" src="../../static/images/praiseIcon.png"
+							<image class="praise-icon" @click.stop="zanTap(index,item.commentId,1)" src="https://ceres.zkthink.com/static/images/praiseIcon.png"
 							 v-else></image>
 							<label class="mar-left-10">{{item.likes}}</label>
 						</view>
@@ -124,7 +124,7 @@
 			</view>
 			</template>
 			<view v-if="evaluateEmpty" class="emptyOrder-box flex-items-plus flex-column">
-				<image class="emptyOrder-img" src="../../static/img/bgnull.png"></image>
+				<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 				<label class="font-color-999 fs26 mar-top-30">你还没有评论哦~</label>
 			</view>
 		</view>

+ 4 - 4
pages_category_page1/homeModule/special.vue

@@ -7,7 +7,7 @@
 			</swiper-item>
 		</swiper>
 <!--		<view class="flex-items-plus mar-top-20">-->
-<!--			<image class="choiceness" src="../../static/images/choiceness.png"></image>-->
+<!--			<image class="choiceness" src="https://ceres.zkthink.com/static/images/choiceness.png"></image>-->
 <!--		</view>-->
 		<view>
 			<!-- {{goodsList.productVOList}} -->
@@ -19,7 +19,7 @@
 					<image class="goodsImg" :src="item.imgs[0]"></image>
 					<view class="mar-left-30">
 						<view class="goodsName-box overflowNoDot">
-							<!-- <image class="img618-cion" src="../../static/images/618.png"></image> -->
+							<!-- <image class="img618-cion" src="https://ceres.zkthink.com/static/images/618.png"></image> -->
 							<label class="goodsName fs26 mar-left-20">{{item.productName}}</label>
 						</view>
 						<view class="priceBuyNum-box mar-top-20">
@@ -30,7 +30,7 @@
 						</view>
 						<view class="flex-display flex-sp-between flex-row mar-top-10 flex-items">
 							<label class="fs22 font-color-999">{{item.storeDTO.storeName}}</label>
-							<image class="arrowImg" src="../../static/img/user/arrow.png"></image>
+							<image class="arrowImg" src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
 						</view>
 					</view>
 				</view>
@@ -39,7 +39,7 @@
 
 		<!-- 为空 -->
 		<view v-else class="emptyOrder-box flex-items-plus flex-column">
-			<image class="emptyOrder-img" src="../../static/img/bgnull.png"></image>
+			<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 			<label class="font-color-999 fs26 mar-top-30">专题商品为空哦~</label>
 		</view>
 	</view>

+ 18 - 6
pages_category_page1/integral/exchangeDetail.vue

@@ -54,9 +54,13 @@
         </view>
       </view>
     </view>
-    <view class="exchangeBtnBg flex-items">
-      <view class="exchangeBtn" @click.stop="receiveCoupon">立即兑换</view>
-    </view>
+
+      <wx-send-coupon @success="success" :couponList="[currentCoupon]" :isExchange="true">
+        <view class="exchangeBtnBg flex-items">
+          <view class="exchangeBtn">立即兑换</view>
+        </view>
+      </wx-send-coupon>
+
     <!-- 签到弹窗 -->
     <tui-modal :show="exchangeTips" :custom="true" :fadein="true">
       <view class="Put-box1">
@@ -80,9 +84,11 @@
 import tuiModal from "@/components/modal/modal";
 import NET from "../../utils/request";
 import API from "../../config/api";
+import WxSendCoupon from "../../components/wx/wxSendCoupon";
 export default {
   name: "exchangeDetail",
   components: {
+    WxSendCoupon,
     tuiModal
   },
   data() {
@@ -167,6 +173,12 @@ export default {
       uni.navigateTo({
         url: '/pages_category_page1/goodsModule/goodsDetails?shopId='+shopId + '&productId='+productId +'&skuId='+skuId
       })
+    },
+    success(){
+      uni.showToast({
+        title: '兑换成功',
+        icon:"success"
+      })
     }
   }
 }
@@ -180,12 +192,12 @@ page {
   padding-bottom: 200rpx;
   background: #F8F8F8;
  .topBg {
-   background: url("../../static/images/addBankBg.png") no-repeat left top;
+   background: url("https://ceres.zkthink.com/static/images/addBankBg.png") no-repeat left top;
    background-size: contain;
    height: 350rpx;
    padding: 40rpx 20rpx 0 20rpx;
    .exchangeCoupon {
-     background: url("../../static/images/exchagneCoupon.png") no-repeat left top;
+     background: url("https://ceres.zkthink.com/static/images/exchagneCoupon.png") no-repeat left top;
      background-size: contain;
      height: 302rpx;
      border-radius: 16rpx;
@@ -261,7 +273,7 @@ page {
     }
   }
   .exchangeBtnBg {
-    width: 100%;
+    width: 750rpx;
     height: 164rpx;
     background: #FFFFFF;
     box-shadow: 0 -1rpx 0rpx rgba(197, 202, 207, 0.5);

+ 12 - 12
pages_category_page1/integral/index.vue

@@ -56,7 +56,7 @@
       <view class="signInBox">
         <view class="signItem flex-items flex-sp-between" v-for="(item, index) of integralRecord" :key="index">
           <view class="leftBox flex-items">
-            <image src="../../static/images/signIcon1.png"></image>
+            <image src="https://ceres.zkthink.com/static/images/signIcon1.png"></image>
             <view class="leftInfo">
               <label class="fs28 font-color-333">{{item.recordContent}}</label>
               <view class="fs24 font-color-999">{{item.createTime}}</view>
@@ -65,7 +65,7 @@
           <view class="rightBtn">{{item.recordType === 1 ? '+' : '-'}}{{item.credit}}</view>
         </view>
         <view class="emptyCart-box flex-items-plus flex-column" v-if="integralRecord.length === 0">
-          <image class="emptyCart-img" src="../../static/images/searchEmpty.png"></image>
+          <image class="emptyCart-img" src="https://ceres.zkthink.com/static/images/searchEmpty.png"></image>
           <label class="font-color-999 fs26 mar-top-30">暂无记录~</label>
         </view>
       </view>
@@ -94,7 +94,7 @@
           </view>
         </view>
         <view class="emptyCart-box flex-items-plus flex-column" v-if="creditCouponList.length === 0">
-          <image class="emptyCart-img" src="../../static/images/searchEmpty.png"></image>
+          <image class="emptyCart-img" src="https://ceres.zkthink.com/static/images/searchEmpty.png"></image>
           <label class="font-color-999 fs26 mar-top-30">暂无优惠券~</label>
         </view>
       </view>
@@ -113,7 +113,7 @@
           </view>
         </view>
         <view v-if="isConvertible" @click="isConvertible = false" class="cancelDel">
-          <image src="../../static/images/cancelClose.png" mode=""></image>
+          <image src="https://ceres.zkthink.com/static/images/cancelClose.png" mode=""></image>
         </view>
       </view>
     </tui-modal>
@@ -243,7 +243,7 @@ page {
 }
 .memberCenter {
   border-top: 2rpx solid #4b4b4b;
-  background: url("../../static/images/addBankBg.png") no-repeat left top;
+  background: url("https://ceres.zkthink.com/static/images/addBankBg.png") no-repeat left top;
   background-size: contain;
   min-height: 800rpx;
   padding: 0 20rpx;
@@ -264,7 +264,7 @@ page {
     .memberBoxTop {
       position: relative;
       .memberTopPos{
-        //background: url("../../static/images/integralBg.png") no-repeat left top;
+        //background: url("https://ceres.zkthink.com/static/images/integralBg.png") no-repeat left top;
         background-size: cover;
         height: 302rpx;
         border-radius: 24rpx;
@@ -310,7 +310,7 @@ page {
     padding: 0 20rpx;
     .signLeft {
       .signIcon {
-        background: url("../../static/images/signIcon.png") no-repeat center left;
+        background: url("https://ceres.zkthink.com/static/images/signIcon.png") no-repeat center left;
         background-size: contain;
         height: 120rpx;
         width: 96rpx;
@@ -339,22 +339,22 @@ page {
         margin-right: 15rpx;
       }
       .detailIcon {
-        background: url("../../static/images/detailIcon.png") no-repeat center center;
+        background: url("https://ceres.zkthink.com/static/images/detailIcon.png") no-repeat center center;
         background-size: contain;
       }
       .exchangeIcon {
-        background: url("../../static/images/exchangeIcon.png") no-repeat center center;
+        background: url("https://ceres.zkthink.com/static/images/exchangeIcon.png") no-repeat center center;
         background-size: contain;
       }
     }
     .active {
       background: #333333;
       .detailIcon {
-        background: url("../../static/images/detailIcon1.png") no-repeat center center;
+        background: url("https://ceres.zkthink.com/static/images/detailIcon1.png") no-repeat center center;
         background-size: contain;
       }
       .exchangeIcon {
-        background: url("../../static/images/exchangeIcon1.png") no-repeat center center;
+        background: url("https://ceres.zkthink.com/static/images/exchangeIcon1.png") no-repeat center center;
         background-size: contain;
       }
       text {
@@ -410,7 +410,7 @@ page {
             color: #FDFED6;
             width: 300rpx;
             height: 146rpx;
-            background: url('../../static/images/exchangeItem.png') no-repeat left top;
+            background: url('https://ceres.zkthink.com/static/images/exchangeItem.png') no-repeat left top;
             background-size: contain;
             padding: 30rpx 25rpx;
           }

+ 2 - 4
pages_category_page1/integral/sign.vue

@@ -131,7 +131,7 @@ export default {
         'POST')
         .then(res => {
           uni.hideLoading()
-
+          that.ifShow = true
           that.signList = res.data
 
           // 初始日期
@@ -139,7 +139,7 @@ export default {
 
           // 今天日期
           if (that.currentMonth === selectMonth) {
-            console.log('currentMoth === selectMonth', that.currentMoth === selectMonth)
+            console.log('currentMoth === selectMonth', that.currentMonth === selectMonth)
             that.continuousNum = that.signList[that.signList.length - 1].continueDay || 0;
             that.lastDay = that.signList[that.signList.length - 1].createTime.substring(0,10);
             console.log('this.lastDay', that.lastDay)
@@ -147,7 +147,6 @@ export default {
 
           // 今天周几
           that.weeked = that.weekArr[new Date().getDay()];
-
           // 签到功能
           if (that.type !== 'calendar') {
             for (let i in that.dayArr) {
@@ -166,7 +165,6 @@ export default {
               }
             }
           }
-          this.ifShow = true
       }).catch(res => {})
     },
     signDate(event) {

+ 6 - 6
pages_category_page1/memberCenter/activityList.vue

@@ -21,8 +21,8 @@
             <view class="r">
               <view class="arrowUp" :class="{activeUp: type == 1}"></view>
               <view class="arrowDown" :class="{activeDown: type == 2}"></view>
-              <!--          <image src="../../static/images/arrowSortUp.png" v-if="type == 1" class="arrow-img padd-t"></image>-->
-              <!--          <image src="../../static/images/arrowSortDown.png" v-if="type == 2" class="arrow-img padd-b"></image>-->
+              <!--          <image src="https://ceres.zkthink.com/static/images/arrowSortUp.png" v-if="type == 1" class="arrow-img padd-t"></image>-->
+              <!--          <image src="https://ceres.zkthink.com/static/images/arrowSortDown.png" v-if="type == 2" class="arrow-img padd-b"></image>-->
             </view>
           </view>
           <view class="nav-item-sort" @click="sortTap(3)">
@@ -30,8 +30,8 @@
             <view class="r">
               <view class="arrowUp" :class="{activeUp: volume == 1}"></view>
               <view class="arrowDown" :class="{activeDown: volume == 2}"></view>
-              <!--          <image src="../../static/images/arrowSortUp.png" v-if="volume == 1" class="arrow-img padd-t"></image>-->
-              <!--          <image src="../../static/images/arrowSortDown.png" v-if="volume == 2" class="arrow-img padd-b"></image>-->
+              <!--          <image src="https://ceres.zkthink.com/static/images/arrowSortUp.png" v-if="volume == 1" class="arrow-img padd-t"></image>-->
+              <!--          <image src="https://ceres.zkthink.com/static/images/arrowSortDown.png" v-if="volume == 2" class="arrow-img padd-b"></image>-->
             </view>
           </view>
         </view>
@@ -49,7 +49,7 @@
               <view class="originalPrice">原价: ¥{{item.originalPrice}}</view>
               <view class="flex-row-plus flex-items-plus">
                 <view class="iconBox">
-                  <image src="../../static/images/memberCenterIcon.png"></image>
+                  <image src="https://ceres.zkthink.com/static/images/memberCenterIcon.png"></image>
                 </view>
                 <view class="flex-row-plus flex-items priceInfo">
                   <label class="fs24">¥</label>
@@ -307,7 +307,7 @@ page {
   .discountBg {
     width: 100%;
     height: 440rpx;
-    background: url("../../static/images/memberCenterBg.png") no-repeat center center;
+    background: url("https://ceres.zkthink.com/static/images/memberCenterBg.png") no-repeat center center;
     background-size: contain;
     position: relative;
   }

+ 3 - 3
pages_category_page1/memberCenter/index.vue

@@ -49,7 +49,7 @@
         <view class="signItem flex-items flex-sp-between">
           <view class="itemLeft flex-items">
             <view class="leftIcon">
-              <image src="../../static/img/member/memberList2.png"></image>
+              <image src="https://ceres.zkthink.com/static/img/member/memberList2.png"></image>
             </view>
             <view class="leftInfo">
               <label class="fs28 font-color-333">购物</label>
@@ -129,7 +129,7 @@ page {
 }
   .memberCenter {
     border-top: 2rpx solid #4b4b4b;
-    background: url("../../static/images/addBankBg.png") no-repeat left top;
+    background: url("https://ceres.zkthink.com/static/images/addBankBg.png") no-repeat left top;
     background-size: contain;
     min-height: 800rpx;
     padding: 0 20rpx;
@@ -199,7 +199,7 @@ page {
         .equityTit {
           color: #FFEBC4;
           font-size: 28rpx;
-          background: url("../../static/images/quityBg.png") no-repeat center center;
+          background: url("https://ceres.zkthink.com/static/images/quityBg.png") no-repeat center center;
           background-size: contain;
           width: 90%;
           margin: 0 auto;

+ 3 - 3
pages_category_page1/memberCenter/memberSign.vue

@@ -32,13 +32,13 @@
 			<view class="signDateList">
 				<view class="signItem" v-for="(item, index) of recordList" :key="item.signinId">
 					<view class="topIcon">
-						<image src="../../static/img/member/signIcon.png"></image>
+						<image src="https://ceres.zkthink.com/static/img/member/signIcon.png"></image>
 					</view>
 					<view class="dateInfo">{{ index + 1 }}天</view>
 				</view>
 				<view class="signItem" v-for="index of noSign" :key="index">
 					<view class="topIcon">
-						<image src="../../static/img/member/signIcon2.png"></image>
+						<image src="https://ceres.zkthink.com/static/img/member/signIcon2.png"></image>
 					</view>
 					<!-- #ifdef MP-WEIXIN -->
 					<view class="dateInfo">{{recordList.length+index+1}}天</view>
@@ -186,7 +186,7 @@
 
 	.memberCenter {
 		border-top: 2rpx solid #4b4b4b;
-		background: url("../../static/img/member/memberSignBg.png") no-repeat left top;
+		background: url("https://ceres.zkthink.com/static/img/member/memberSignBg.png") no-repeat left top;
 		background-size: contain;
 		min-height: 900rpx;
 		padding: 0 20rpx;

+ 1 - 1
pages_category_page1/orderModule/Intervene.vue

@@ -181,7 +181,7 @@ page{
   content: '';
   height: 71rpx;
   width: 71rpx;
-  background: url("../../static/images/addImg.png") no-repeat center center;
+  background: url("https://ceres.zkthink.com/static/images/addImg.png") no-repeat center center;
   display: block;
   background-size: contain;
 }

+ 2 - 2
pages_category_page1/orderModule/addLogistics.vue

@@ -7,7 +7,7 @@
 					<view class="l">物流公司</view>
 					<view class="r-box">
 						<text>{{SendReturnQuery.logisticsName}}</text>
-						<image src="../../static/images/arrowRight.png" class="r"></image>
+						<image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="r"></image>
 					</view>
 				</view>
 
@@ -561,7 +561,7 @@
   content: '';
   height: 71rpx;
   width: 71rpx;
-  background: url("../../static/images/addImg.png") no-repeat center center;
+  background: url("https://ceres.zkthink.com/static/images/addImg.png") no-repeat center center;
   display: block;
   background-size: contain;
 }

+ 10 - 10
pages_category_page1/orderModule/afterSaleApplyRefund.vue

@@ -25,18 +25,18 @@
           <view class="l">货物状态</view>
           <view class="r-box" v-model="ReturnMoneyQuery.goodsState" v-if="ReturnMoneyQuery.goodsState == 0">
             <text>未收到货</text>
-            <image src="../../static/images/arrowRight.png" class="r"></image>
+            <image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="r"></image>
           </view>
           <view class="r-box" v-model="ReturnMoneyQuery.goodsState" v-if="ReturnMoneyQuery.goodsState == 1">
             <text>已收到货</text>
-            <image src="../../static/images/arrowRight.png" class="r"></image>
+            <image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="r"></image>
           </view>
         </view>
         <view class="item" @click="openReasonSelect">
           <view class="l">退款原因</view>
           <view class="r-box">
             <text v-model="ReturnMoneyQuery.returnReason">{{liyoutext}}</text>
-            <image src="../../static/images/arrowRight.png" class="r"></image>
+            <image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="r"></image>
           </view>
         </view>
       </view>
@@ -85,13 +85,13 @@
           <view class="item-box">
             <view class="item" @click="ReturnMoneyQuery.goodsState = 0">
               <text class="status-select-title">未收到货</text>
-              <image mode="aspectFill" src="../../static/images/selectActive.png" v-if="ReturnMoneyQuery.goodsState == 0" class="status-select-img"></image>
-              <image mode="aspectFill" src="../../static/images/selectEmpty.png" v-else class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="ReturnMoneyQuery.goodsState == 0" class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectEmpty.png" v-else class="status-select-img"></image>
             </view>
             <view class="item" @click="ReturnMoneyQuery.goodsState = 1">
               <text class="status-select-title">已收到货</text>
-              <image mode="aspectFill" src="../../static/images/selectActive.png" v-if="ReturnMoneyQuery.goodsState == 1" class="status-select-img"></image>
-              <image mode="aspectFill" src="../../static/images/selectEmpty.png" v-else class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="ReturnMoneyQuery.goodsState == 1" class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectEmpty.png" v-else class="status-select-img"></image>
             </view>
           </view>
           <view class="status-btn" @click="closeStatusSelect">确定</view>
@@ -106,8 +106,8 @@
           <view class="item-box">
             <view class="item" @click="returnReasonTap(item,index)" v-for="(item,index) in liyouData" :key="index">
               <text class="status-select-title">{{item}}</text>
-              <image mode="aspectFill" src="../../static/images/selectActive.png" v-if="ReturnMoneyQuery.returnReason == index" class="status-select-img"></image>
-              <image mode="aspectFill" src="../../static/images/selectEmpty.png" v-else class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="ReturnMoneyQuery.returnReason == index" class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectEmpty.png" v-else class="status-select-img"></image>
             </view>
           </view>
           <view class="status-btn" @click="closeReasonSelect">确定</view>
@@ -674,7 +674,7 @@ export default {
   content: '';
   width: 80rpx;
   height: 80rpx;
-  background: url("../../static/images/addImgBtn.png") center center;
+  background: url("https://ceres.zkthink.com/static/images/addImgBtn.png") center center;
   background-size: contain;
 }
 .afterSale-select-box /deep/ .u-add-tips {

+ 9 - 9
pages_category_page1/orderModule/afterSaleApplyRetund.vue

@@ -26,18 +26,18 @@
           <view class="l">货物状态</view>
           <view class="r-box" v-model="ReturnMoneyQuery.goodsState" v-if="ReturnMoneyQuery.goodsState == 0">
             <text>未收到货</text>
-            <image src="../../static/images/arrowRight.png" class="r"></image>
+            <image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="r"></image>
           </view>
           <view class="r-box" v-model="ReturnMoneyQuery.goodsState" v-if="ReturnMoneyQuery.goodsState == 1">
             <text>已收到货</text>
-            <image src="../../static/images/arrowRight.png" class="r"></image>
+            <image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="r"></image>
           </view>
         </view>
         <view class="item" @click="openReasonSelect">
           <view class="l">退款原因</view>
           <view class="r-box">
             <text v-model="ReturnMoneyQuery.returnReason">{{liyoutext}}</text>
-            <image src="../../static/images/arrowRight.png" class="r"></image>
+            <image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="r"></image>
           </view>
         </view>
       </view>
@@ -86,13 +86,13 @@
           <view class="item-box">
             <view class="item" @click="ReturnMoneyQuery.goodsState = 0">
               <text class="status-select-title">未收到货</text>
-              <image mode="aspectFill" src="../../static/images/selectActive.png" v-if="ReturnMoneyQuery.goodsState == 0" class="status-select-img"></image>
-              <image mode="aspectFill" src="../../static/images/selectEmpty.png" v-else class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="ReturnMoneyQuery.goodsState == 0" class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectEmpty.png" v-else class="status-select-img"></image>
             </view>
             <view class="item" @click="ReturnMoneyQuery.goodsState = 1">
               <text class="status-select-title">已收到货</text>
-              <image mode="aspectFill" src="../../static/images/selectActive.png" v-if="ReturnMoneyQuery.goodsState == 1" class="status-select-img"></image>
-              <image mode="aspectFill" src="../../static/images/selectEmpty.png" v-else class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="ReturnMoneyQuery.goodsState == 1" class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectEmpty.png" v-else class="status-select-img"></image>
             </view>
           </view>
           <view class="status-btn" @click="closeStatusSelect">确定</view>
@@ -108,8 +108,8 @@
           <view class="item-box">
             <view class="item" @click="returnReasonTap(item,index)" v-for="(item,index) in liyouData" :key="index">
               <text class="status-select-title">{{item}}</text>
-              <image mode="aspectFill" src="../../static/images/selectActive.png" v-if="ReturnMoneyQuery.returnReason == index" class="status-select-img"></image>
-              <image mode="aspectFill" src="../../static/images/selectEmpty.png" v-else class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="ReturnMoneyQuery.returnReason == index" class="status-select-img"></image>
+              <image mode="aspectFill" src="https://ceres.zkthink.com/static/images/selectEmpty.png" v-else class="status-select-img"></image>
             </view>
           </view>
           <view class="status-btn" @click="closeReasonSelect">确定</view>

+ 4 - 4
pages_category_page1/orderModule/index.vue

@@ -13,7 +13,7 @@
 							<view class="top-l" @click.stop="goShop(item.shopId)">
 								<image :src="item.shopLogo" class="shop-img"></image>
 								<text class="shop-name">{{item.shopName}}</text>
-								<image src="../../static/images/arrowRight.png" class="arrow-img"></image>
+								<image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="arrow-img"></image>
 							</view>
 							<!--订单状态: 退款中 交易关闭 待付款 待发货 待收货 已完成-->
 							<view class="order-status" v-if='item.state==1'>待付款</view>
@@ -78,7 +78,7 @@
 					</view>
 				</view>
 				<view v-if="ifEmpty" class="emptyOrder-box flex-items-plus flex-column">
-					<image class="emptyOrder-img" src="../../static/images/emptyOrderImg.png"></image>
+					<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/images/emptyOrderImg.png"></image>
 					<label class="font-color-999 fs26 mar-top-30">你还没有订单哦~</label>
 				</view>
 			</view>
@@ -97,7 +97,7 @@
 					</view>
 					<view class="pay-type-radio">
 						<view class="pay-type-img">
-							<img class="pay-type-img-inner" src="../../static/images/huabei.png" />
+							<img class="pay-type-img-inner" src="https://ceres.zkthink.com/static/images/huabei.png" />
 						</view>
 						<label class="pay-type-label">花呗分期</label>
 						<radio class="pay-type-radio-item" style="transform:scale(0.7)" :disabled="totalPrice < 0.03"
@@ -855,7 +855,7 @@
 			.delIcon {
 				width: 40rpx;
 				height: 40rpx;
-				background: url("../../static/images/delListOrder.png") no-repeat center center;
+				background: url("https://ceres.zkthink.com/static/images/delListOrder.png") no-repeat center center;
 				background-size: contain;
 			}
 		}

+ 1 - 1
pages_category_page1/orderModule/logisticsInfo.vue

@@ -15,7 +15,7 @@
 			</view>
 		</view>
 		<view v-else class="emptyOrder-box flex-items-plus flex-column">
-			<image class="emptyOrder-img" src="../../static/img/bgnull.png"></image>
+			<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 			<label class="font-color-999 fs26 mar-top-30">你还没有物流信息哦~</label>
 		</view>
 	</view>

+ 38 - 35
pages_category_page1/orderModule/orderConfirm.vue

@@ -3,7 +3,7 @@
   <view v-if="ifShow">
     <view class="content">
       <view class="address-box" @click="addAddressTap">
-        <image src="../../static/images/orderAddress.png" class="address-img"></image>
+        <image src="https://ceres.zkthink.com/static/images/orderAddress.png" class="address-img"></image>
         <!-- 有地址的 -->
         <view class="address-r" v-if="userAddressInfo.receiveName">
           <view class="address-name-box">
@@ -18,15 +18,15 @@
         <view class="address-r" v-else>
           <text>你还没有收货地址哦,点击这里添加</text>
         </view>
-        <image src="../../static/images/greyArrow.png" class="arrow-right-img"></image>
+        <image src="https://ceres.zkthink.com/static/images/greyArrow.png" class="arrow-right-img"></image>
       </view>
       <view class="order-list-box">
         <view class="item" v-for="(item, sIndex) in settlement.shops" :key="item.shopId">
           <view class="order-list-top">
             <view class="top-l">
-              <image src="../../static/images/orderStoreIcon.png" class="shop-img"></image>
+              <image src="https://ceres.zkthink.com/static/images/orderStoreIcon.png" class="shop-img"></image>
               <text class="shop-name">{{item.shopName}}</text>
-              <image src="../../static/images/greyArrow.png" class="arrow-img"></image>
+              <image src="https://ceres.zkthink.com/static/images/greyArrow.png" class="arrow-img"></image>
             </view>
           </view>
           <view class="order-info-box">
@@ -68,11 +68,11 @@
               <view class="discount-info-box flex-items">
                 <view class="discount-info2" v-if="item.currentCoupon && item.currentCoupon.couponType == 1">-¥{{item.currentCoupon.reduceMoney}}</view>
                 <view class="discount-info2" v-if="item.currentCoupon && item.currentCoupon.couponType == 2">{{item.currentCoupon.reduceMoney}}折券</view>
-                <image class="discount-img" src="../../static/images/arrowRight.png"></image>
+                <image class="discount-img" src="https://ceres.zkthink.com/static/images/arrowRight.png"></image>
               </view>
               <!--							<view class="discount-info-box flex-items" v-else>-->
               <!--								<view class="discount-info1"></view>-->
-              <!--								<image class="discount-img" src="../../static/images/arrowRight.png"></image>-->
+              <!--								<image class="discount-img" src="https://ceres.zkthink.com/static/images/arrowRight.png"></image>-->
               <!--							</view>-->
             </view>
             <view class="order-total-box">
@@ -94,7 +94,7 @@
           </view>
           <view class="discount-info1" v-else-if="couponsList.length<1">无</view>
           <view class="discount-info1" v-else>不使用</view>
-          <image class="discount-img" src="../../static/images/arrowRight.png"></image>
+          <image class="discount-img" src="https://ceres.zkthink.com/static/images/arrowRight.png"></image>
         </view>
       </view>
 <!--      积分支付-->
@@ -112,7 +112,7 @@
         <radio-group @change="payTypeChange">
           <view class="pay-type-radio" v-if="showWechatPayType">
             <view class="pay-type-img">
-              <image class="pay-type-img-inner" src="../../static/images/wechat_pay.png" mode="widthFix"/>
+              <image class="pay-type-img-inner" src="https://ceres.zkthink.com/static/images/wechat_pay.png" mode="widthFix"/>
             </view>
             <label class="pay-type-label">微信支付</label>
             <radio class="pay-type-radio-item" style="transform:scale(0.7)" value="1" :checked="paymentMode == 1"/>
@@ -126,7 +126,7 @@
           </view>
           <view class="pay-type-radio" v-if="showHuabeiPayType">
             <view class="pay-type-img">
-              <image class="pay-type-img-inner" src="../../static/images/huabei.png" mode="widthFix"/>
+              <image class="pay-type-img-inner" src="https://ceres.zkthink.com/static/images/huabei.png" mode="widthFix"/>
             </view>
             <label class="pay-type-label">花呗分期</label>
             <radio class="pay-type-radio-item" style="transform:scale(0.7)" value="3" :checked="paymentMode == 3"/>
@@ -136,7 +136,7 @@
                 <label class="fenqi-charge-fee">手续费 ¥{{chargeFee|clip2Decimal}}</label>
               </view>
               <label class="fenqi-amount">分期总额 ¥{{ (totalprice - reduceMoney) | clip2Decimal }}</label>
-              <img class="fenqi-modal" src="../../static/images/arrowRight.png"/>
+              <img class="fenqi-modal" src="https://ceres.zkthink.com/static/images/arrowRight.png"/>
             </view>
           </view>
         </radio-group>
@@ -169,7 +169,7 @@
              close-icon-size="20">
       <view class="activity-box" style="height: 1000rpx;">
         <view class="title-box">
-          <image class="close-btn" @click="onDiscountClose" src="../../static/images/close.png"></image>
+          <image class="close-btn" @click="onDiscountClose" src="https://ceres.zkthink.com/static/images/close.png"></image>
         </view>
         <view class="activity-coupon-box">
           <scroll-view scroll-y="true" style="height: 900rpx;">
@@ -177,15 +177,19 @@
               <view v-if="usableListLength">
                 <view class="label-lingqu">可用优惠券列表</view>
                 <view class="couponBox">
-                  <view class="coupon-item" v-for="(usableItem, index) in settlement.coupons" :key="index" @click="couponItemTap(index,usableItem)">
+                  <view class="coupon-item"
+                    v-for="(usableItem, index) in settlement.coupons"
+                    :key="index"
+                    @click="couponItemTap(index,usableItem)"
+                  >
                     <view class="money-box" v-if="usableItem.couponType == 1">¥{{usableItem.reduceMoney}}</view>
                     <view class="money-box" v-else>{{usableItem.reduceMoney}}折券</view>
                     <view class="info-box">
                       <view class="date font-color-999" style="font-size:22upx;  margin-top: 20upx;">{{getDate(usableItem.startTime.replace(/-/g, '.'))}}-{{getDate(usableItem.endTime.replace(/-/g, '.'))}}</view>
                       <view class="info font-color-999">满{{usableItem.fullMoney}}元可用</view>
                     </view>
-                    <image class="check-img" src="../../static/images/selectActive.png" v-if="couponCheckedindex == index"></image>
-                    <image class="check-img" src="../../static/images/selectEmpty.png" v-else></image>
+                    <image class="check-img" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="couponCheckedindex == index"></image>
+                    <image class="check-img" src="https://ceres.zkthink.com/static/images/selectEmpty.png" v-else></image>
                   </view>
                 </view>
               </view>
@@ -198,7 +202,7 @@
              close-icon-size="20">
       <view class="activity-box">
         <view class="title-box">
-          <image class="close-btn" @click="onshopClose" src="../../static/images/close.png"></image>
+          <image class="close-btn" @click="onshopClose" src="https://ceres.zkthink.com/static/images/close.png"></image>
         </view>
         <view class="activity-coupon-box">
           <scroll-view scroll-y="true" style="height: 900rpx;">
@@ -213,8 +217,8 @@
                     <view class="info-box">
                       <view class="info font-color-999">满{{sItem.fullMoney}}元可用</view>
                     </view>
-                    <image class="check-img" src="../../static/images/selectActive.png" v-if="selectCouponIdList.indexOf(sItem.id) >= 0"></image>
-                    <image class="check-img" src="../../static/images/selectEmpty.png" v-else></image>
+                    <image class="check-img" src="https://ceres.zkthink.com/static/images/selectActive.png" v-if="selectCouponIdList.indexOf(sItem.id) >= 0"></image>
+                    <image class="check-img" src="https://ceres.zkthink.com/static/images/selectEmpty.png" v-else></image>
                   </view>
                 </view>
               </view>
@@ -368,6 +372,14 @@ export default {
     this.back();
     return true
   },
+  filters: {
+    clip2Decimal(value) {
+      if (value === undefined || value === null) {
+        return "0.00"
+      }
+      return (parseInt(value * 100) / 100).toFixed(2)
+    }
+  },
   methods: {
     getQuery(){
       NET.request(API.Query,{
@@ -516,8 +528,7 @@ export default {
     },
     // 平台优惠券选择
     couponItemTap(index, usableItem) {
-      console.log(this.selectShopCoupon[0], 'testpintai')
-      if (this.selectShopCoupon.length) {
+      if (this.selectShopCoupon.length) { // 判断商家卷情况
         if (this.selectShopCoupon[0].ifAdd === 0) {
           uni.showToast({
             title: '不可与商家券券叠加使用!',
@@ -540,8 +551,8 @@ export default {
         this.getTotal(usableItem)
       } else {
         //console.log(usableItem.reduceMoney, 'item')
-        let moneySum = 0
-        let shopslen = this.settlement.shops.length
+        let moneySum = 0 // 订单总价
+        let shopslen = this.settlement.shops.length // 结算页店铺数量
         for (let i = 0; i < shopslen; i++) {
           moneySum += this.settlement.shops[i].total
         }
@@ -693,16 +704,16 @@ export default {
       }
       if (item) {
         console.log(this.discountPrice, 'discountPrice', allNum, 'allNum', this.totalprice, 'totalprice', this.reduceMoney, 'reduceMoney')
-        if (item.couponType === 1 && this.totalprice - this.reduceMoney > 0) {
+        if (item.couponType === 1 && this.totalprice - this.reduceMoney > 0) { // 满减
           this.discountPrice = allNum - this.totalprice + this.reduceMoney
           this.totalprice = allNum - this.discountPrice
-        } else if (item.couponType === 2 && this.reduceMoney > 0) {
-          console.log(121212)
+        } else if (item.couponType === 2 && this.reduceMoney > 0) { // 折扣
           this.discountPrice = allNum - this.totalprice * (this.reduceMoney / 10)
-          this.totalprice = allNum
+          this.totalprice = allNum - this.discountPrice
         } else {
           this.discountPrice = allNum
         }
+        console.log('discountPrice', this.discountPrice, 'reduceMoney', this.reduceMoney)
       }
       // 积分支付计算
       var skuCreditMap = Object.keys(this.settlement.skuCreditMap);
@@ -746,13 +757,13 @@ export default {
         this.chargeFee = ((this.totalprice - this.reduceMoney) * (this.huabeiFeerateList[index] / 100)).toFixed(2)
       }
     },
+    // 展示平台端优惠卷
     showDiscount() {
       // let shopifAdd = 1
       // if(this.settlement.shops[this.shopIndex].shopCoupons.length>0){
       // 	shopifAdd = this.settlement.shops[this.shopIndex].shopCoupons[this.shopCouIndex].ifAdd
       // }
       if (this.settlement.coupons.length > 0) {
-        let ifAdd = 0
         //console.log(this.selectShopCoupon, 'selectShopCoupon')
         for (let i = 0; i < this.selectShopCoupon.length; i++) {
           if (this.selectShopCoupon[i].ifAdd == 0) {
@@ -1218,14 +1229,6 @@ export default {
 	    this.paymentMode = 2
       // #endif
     }
-  },
-  filters: {
-    clip2Decimal(value) {
-      if (value === undefined || value === null) {
-        return "0.00"
-      }
-      return (parseInt(value * 100) / 100).toFixed(2)
-    }
   }
 }
 </script>
@@ -1878,7 +1881,7 @@ page {
 .coupon-item {
   width: 48%;
   height: 291rpx;
-  background: url("../../static/images/couponsIcon.png") no-repeat center top;
+  background: url("https://ceres.zkthink.com/static/images/couponsIcon.png") no-repeat center top;
   margin-top: 20upx;
   color: #C5AA7B;
   flex-shrink: 0;

+ 16 - 16
pages_category_page1/orderModule/orderDetails.vue

@@ -9,7 +9,7 @@
 						<text class="status">等待买家付款</text>
 						<text class="label">剩{{hou}}小时{{min}}分{{sec}}秒自动关闭</text>
 					</view>
-<!--					<image class='r' src="../../static/images/orderDaifukuan.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/orderDaifukuan.png"></image>-->
 				</view>
 				<!--  待发货-->
 				<view class="status-title-box" v-else-if='dataList.state==2'>
@@ -17,7 +17,7 @@
 						<text class="status">等待卖家发货</text>
 						<text class="label">付款后2-5个工作日发货</text>
 					</view>
-<!--					<image class='r' src="../../static/images/orderDaifahuo.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/orderDaifahuo.png"></image>-->
 				</view>
 				<!--  待收货-->
 				<view class="status-title-box" v-else-if='dataList.state==3'>
@@ -25,7 +25,7 @@
 						<text class="status">卖家已发货</text>
 						<!-- <text class="label">还剩5天21小时自动确认</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/orderDaishouhuo.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/orderDaishouhuo.png"></image>-->
 				</view>
 				<!-- 已完成 -->
 				<view class="status-title-box" v-else-if='dataList.state==4'>
@@ -33,7 +33,7 @@
 						<text class="status">交易成功</text>
 						<text class="label">感谢您的使用</text>
 					</view>
-<!--					<image class='r' src="../../static/images/orderDaipingjia.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/orderDaipingjia.png"></image>-->
 				</view>
 				<!--  拼团失败-->
 				<view class="status-title-box" v-else-if='dataList.state==5 && dataList.collageId != 0'>
@@ -42,7 +42,7 @@
 						<text class="label">剩余时间 00:00:00</text>
 					</view>
 					<view class="clusterback">
-<!--						<image class='r' src="../../static/images/staycluster.png"></image>-->
+<!--						<image class='r' src="https://ceres.zkthink.com/static/images/staycluster.png"></image>-->
 					</view>
 				</view>
 				<!-- 交易关闭-->
@@ -62,13 +62,13 @@
 						<text class="status">待成团</text>
 						<text class="label">剩余时间{{hou}}小时{{min}}分{{sec}}秒</text>
 					</view>
-<!--					<image class='r' src="../../static/images/clusterloss.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/clusterloss.png"></image>-->
 				</view>
 
 			</view>
 			<view class="order-details-info-box">
 				<view class="address-box">
-					<image src="../../static/images/orderAddress.png" class="address-img"></image>
+					<image src="https://ceres.zkthink.com/static/images/orderAddress.png" class="address-img"></image>
 					<view class="address-r">
 						<view class="address-name-box">
 							<text>{{dataList.receiveName}}</text>
@@ -78,19 +78,19 @@
 							<text>{{dataList.receiveAdress}} {{dataList.address}}</text>
 						</view>
 					</view>
-					<image src="../../static/images/arrowRight.png" v-if="false" class="arrow-right-img"></image>
+					<image src="https://ceres.zkthink.com/static/images/arrowRight.png" v-if="false" class="arrow-right-img"></image>
 				</view>
 
 				<view class="order-list-box">
 					<view class="item">
 						<view class="order-list-top">
 							<view class="top-l" @click="goShop(dataList.shopId)">
-								<image src="../../static/images/orderStoreIcon.png" class="shop-img"></image>
+								<image src="https://ceres.zkthink.com/static/images/orderStoreIcon.png" class="shop-img"></image>
 								<text class="shop-name">{{dataList.shopName}}</text>
-								<image src="../../static/images/arrowRight.png" class="arrow-img"></image>
+								<image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="arrow-img"></image>
 							</view>
 							<view class="toService" @click="openService">
-								<image src="../../static/images/serviceImg-order-detail.png"  class="service-img" ></image>
+								<image src="https://ceres.zkthink.com/static/images/serviceImg-order-detail.png"  class="service-img" ></image>
 								<text>联系客服</text>
 							</view>
 						</view>
@@ -236,9 +236,9 @@
 						<text class="line"></text>
 						<text>物流信息</text>
 					</view>
-					<image mode="aspectFill" src="../../static/images/arrowDown.png" class="arrow-down-img"
+					<image mode="aspectFill" src="https://ceres.zkthink.com/static/images/arrowDown.png" class="arrow-down-img"
 						style="transform:rotate(180deg);" v-if="isShowWuLiu == true"></image>
-					<image mode="aspectFill" src="../../static/images/arrowDown.png" class="arrow-down-img" v-else>
+					<image mode="aspectFill" src="https://ceres.zkthink.com/static/images/arrowDown.png" class="arrow-down-img" v-else>
 					</image>
 				</view>
 			</view>
@@ -248,7 +248,7 @@
 					<uni-steps :options="steps" direction="column" :active="0"></uni-steps>
 				</view>
 				<view v-else class="emptyOrder-box flex-items-plus flex-column">
-					<image class="emptyOrder-img" src="../../static/img/bgnull.png"></image>
+					<image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 					<label class="font-color-999 fs26 mar-top-30">这里空空如也~</label>
 				</view>
 			</view>
@@ -287,7 +287,7 @@
 					</view>
 					<view class="pay-type-radio">
 						<view class="pay-type-img">
-							<img class="pay-type-img-inner" src="../../static/images/huabei.png" />
+							<img class="pay-type-img-inner" src="https://ceres.zkthink.com/static/images/huabei.png" />
 						</view>
 						<label class="pay-type-label">花呗分期</label>
 						<radio class="pay-type-radio-item" style="transform:scale(0.7)" :disabled="totalPrice < 0.03"
@@ -1073,7 +1073,7 @@
 				})
 			},
 			openService() {
-				if (this.isLoading) { return }
+				if (this.isLoading || !this.shopId || this.shopId === 'null') { return }
 				const shopids = uni.getStorageSync('service_shopids') || []
 				const corpIds = uni.getStorageSync('service_corpIds') || []
 				const urls = uni.getStorageSync('service_urls') || []

+ 2 - 2
pages_category_page1/orderModule/paySuccessful.vue

@@ -2,7 +2,7 @@
   <view class="payCourteous">
     <view class="resultCard">
       <view class="imgBox">
-        <image src="../../static/images/payIcon.png"></image>
+        <image src="https://ceres.zkthink.com/static/images/payIcon.png"></image>
       </view>
       <view class="successful">支付成功</view>
       <view class="btnBox fs28 font-color-333">
@@ -11,7 +11,7 @@
       </view>
       <view class="orderPolite" v-if="orderPolite.growth || orderPolite.couponList">
         <view class="politeImgBox">
-          <image src="../../static/images/politeIcon.png"></image>
+          <image src="https://ceres.zkthink.com/static/images/politeIcon.png"></image>
         </view>
         <view class="rightInfo">
           <view class="growthBox"

+ 1 - 1
pages_category_page1/orderModule/platformJoin.vue

@@ -502,7 +502,7 @@ const API = require('../../config/api')
   content: '';
   height: 71rpx;
   width: 71rpx;
-  background: url("../../static/images/addImg.png") no-repeat center center;
+  background: url("https://ceres.zkthink.com/static/images/addImg.png") no-repeat center center;
   display: block;
   background-size: contain;
 }

+ 6 - 6
pages_category_page1/search/index/index.vue

@@ -4,11 +4,11 @@
 		<view>
 			<view class="flex-items-plus flex-row mar-top-20">
 				<view class="searchImg-box flex-items-plus">
-					<image class="searchImg" src="../../../static/img/searchImg.png"></image>
+					<image class="searchImg" src="https://ceres.zkthink.com/static/img/searchImg.png"></image>
 					<input class="search-box" v-model="keyWord" placeholder-class="searchboxPlace"
 						placeholder="请输入您想要的宝贝" />
 					<image class="searchClose-icon" @click="searchTextDel"
-						src="../../../static/img/index/searchClose_icon.png"></image>
+						src="https://ceres.zkthink.com/static/img/index/searchClose_icon.png"></image>
 				</view>
 				<view class="mar-left-40 fs26" @click="getList">搜索</view>
 			</view>
@@ -19,9 +19,9 @@
 			<view class="boxTitle mar-leftgetList-30" v-if="hotSearchList.length>0">
 				<label class="fs30 font-color-999 fs-weight-300">热门搜索</label>
 				<image class="seeIcon hotSearchListSee-icon" v-if="isSee" @click="changeHotSearchListIsSee"
-					src="../../../static/img/see.png"></image>
+					src="https://ceres.zkthink.com/static/img/see.png"></image>
 				<image class="seeIcon hotSearchListNotSee-icon" v-else @click="changeHotSearchListIsSee"
-					src="../../../static/img/notSee.png"></image>
+					src="https://ceres.zkthink.com/static/img/notSee.png"></image>
 			</view>
 			<view>
 				<view class="flex-wrap-1 flex-row" v-if="isSee">
@@ -39,7 +39,7 @@
 		<view class="historyBox tipsBox">
 			<view class="boxTitle mar-leftgetList-30" v-if="historyList.length>0">
 				<label class="fs30 font-color-999 fs-weight-300 ">历史搜索</label>
-				<image class="historyDel-icon" @click="historyDelAll" src="../../../static/img/index/historyDel_icon.png">
+				<image class="historyDel-icon" @click="historyDelAll" src="https://ceres.zkthink.com/static/img/index/historyDel_icon.png">
 				</image>
 			</view>
 			<view class="historySear-box flex-wrap-1 flex-row">
@@ -52,7 +52,7 @@
 					<label class="font-color-DDD fs22 pad-topbot-10 text-align">|</label>
 					<view class="historyIconBox" @click="historyDelOne(item.searchId)">
 						<image class="historySearDel-icon text-align"
-							src="../../../static/img/index/historySearDel_icon.png"></image>
+							src="https://ceres.zkthink.com/static/img/index/historySearDel_icon.png"></image>
 					</view>
 				</view>
 			</view>

+ 15 - 15
pages_category_page1/store/index.vue

@@ -3,9 +3,9 @@
 		<!-- 店铺首页 -->
 		<view class="content" v-if="id">
 			<view class="shop-top" :style="{'padding-top': topHeight + 'px'}">
-				<image src="../../static/images/back_img04.png" class="back" @click="back"></image>
+				<image src="https://ceres.zkthink.com/static/images/back_img04.png" class="back" @click="back"></image>
         <view class="search-btn" @click="searchPro">
-          <image class="search-icon" src="@/static/images/searchImg1.png" mode="widthFix"></image>
+          <image class="search-icon" src="https://ceres.zkthink.com/images/searchImg1.png" mode="widthFix"></image>
           <text class="fs24 font-color-999 mar-left-10">请输入您想要的宝贝</text>
         </view>
 			</view>
@@ -20,7 +20,7 @@
               </view>
 							<!-- #ifdef MP-WEIXIN -->
 							<view v-if="hasService" class="btns flex-column-plus mar-left-10" @click="flyToService">
-								<image class="store-icon" src="../../static/images/service-product-detail.png"></image>
+								<image class="store-icon" src="https://ceres.zkthink.com/static/images/service-product-detail.png"></image>
 								<text>客服</text>
 							</view>
 							<!-- #endif -->
@@ -28,9 +28,9 @@
 					</view>
 					<view class="contentRight">
 						<view class="favorites-box cur-poi" @click="collectToggle">
-              <image v-if="ifCollect === 0" class="store-icon" src="../../static/images/iconShoucang.png">
+              <image v-if="ifCollect === 0" class="store-icon" src="https://ceres.zkthink.com/static/images/iconShoucang.png">
               </image>
-              <image v-else class="store-icon" src="../../static/images/shoucangActive.png"></image>
+              <image v-else class="store-icon" src="https://ceres.zkthink.com/static/images/shoucangActive.png"></image>
               <text class="text">{{ifCollect === 0? '收藏' : '取消'}}</text>
             </view>
 					</view>
@@ -38,12 +38,12 @@
         <view class="distributorBox flex-items flex-sp-between" @click="applyForRecruit">
           <view class="distributor">
             <view class="flex-display flex-items">
-              <image class="item-btn-icon" src="../../static/img/user/fenxiao2.png" mode="widthFix"></image>
+              <image class="item-btn-icon" src="https://ceres.zkthink.com/static/img/user/fenxiao2.png" mode="widthFix"></image>
               <view>成为分销员</view>
             </view>
           </view>
           <view class="rightArrow">
-            <image src="../../static/images/arrowRight.png"></image>
+            <image src="https://ceres.zkthink.com/static/images/arrowRight.png"></image>
           </view>
         </view>
       </view>
@@ -91,18 +91,18 @@
                   <view class="nav-item-sort" @click="sortTap(2)">
                     <text class="nav-title" :class="{'active' : sortIndex == 2}">价格</text>
                     <view class="r">
-                      <image src="../../static/images/arrowSortUp.png" v-if="type == 1"
+                      <image src="https://ceres.zkthink.com/static/images/arrowSortUp.png" v-if="type == 1"
                              class="arrow-img padd-t"></image>
-                      <image src="../../static/images/arrowSortDown.png" v-if="type == 2"
+                      <image src="https://ceres.zkthink.com/static/images/arrowSortDown.png" v-if="type == 2"
                              class="arrow-img padd-b"></image>
                     </view>
                   </view>
                   <view class="nav-item-sort" @click="sortTap(3)">
                     <text class="nav-title" :class="{'active' : sortIndex == 3}">销量</text>
                     <view class="r">
-                      <image src="../../static/images/arrowSortUp.png" v-if="volume == 1"
+                      <image src="https://ceres.zkthink.com/static/images/arrowSortUp.png" v-if="volume == 1"
                              class="arrow-img padd-t"></image>
-                      <image src="../../static/images/arrowSortDown.png" v-if="volume == 2"
+                      <image src="https://ceres.zkthink.com/static/images/arrowSortDown.png" v-if="volume == 2"
                              class="arrow-img padd-b"></image>
                     </view>
                   </view>
@@ -167,7 +167,7 @@
 				ifCollect: 0,
 				salesId: 0, //分销员id
         fansNumber: '', // 粉丝数
-        topHeight: 0,
+        topHeight: 10,
 				hasService: false,
 				isLoading: false,
 			}
@@ -176,11 +176,11 @@
 			canvasPage
 		},
 		onLoad(options) {
-			// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+            // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
       let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
       this.topHeight = menuButtonInfo.top
       console.log(this.topHeight, menuButtonInfo.top, 'fsfsfsfs')
-			// #endif
+            // #endif
       this.isIphone = getApp().globalData.isIphone;
 			if (getApp().globalData.shopShareItem) {
 				const item = getApp().globalData.shopShareItem
@@ -480,7 +480,7 @@
       },
 			// 获取客服url
 			getServiceUrl(id) {
-				if (this.isLoading || !id) { return }
+				if (this.isLoading || !id || id === 'null') { return }
 				const shopids = uni.getStorageSync('service_shopids') || []
 				const corpIds = uni.getStorageSync('service_corpIds') || []
 				const urls = uni.getStorageSync('service_urls') || []

+ 9 - 9
pages_category_page2/channelCoupon/index.vue

@@ -9,7 +9,7 @@
       <view class="info">
         <view class="price-box">
           <view class="icon">
-            <img class="icon-img" src="../../static/img/channelCoupon/icon-coupon.png" alt="" mode="widthFix"/>
+            <img class="icon-img" src="https://ceres.zkthink.com/static/img/channelCoupon/icon-coupon.png" alt="" mode="widthFix"/>
           </view>
           <label class="price">¥{{channelCouponData.price}}</label>
           <label class="original-price">¥{{channelCouponData.originalPrice}}</label>
@@ -34,7 +34,7 @@
     </view>
     <div class="pro-list" v-if="productList && productList.length > 0">
       <div class="title">
-        <img class="title-img" src="../../static/img/channelCoupon/img-title.png" alt="商品推荐" mode="widthFix"/>
+        <img class="title-img" src="https://ceres.zkthink.com/static/img/channelCoupon/img-title.png" alt="商品推荐" mode="widthFix"/>
       </div>
       <div class="product-list">
         <div class="product-list-box" >
@@ -55,12 +55,12 @@
                   <label class="buy-count">{{item.users?item.users: 0}}人付款</label>
                 </div>
                 <div class="price-warp">
-                  <img class="iconImg" v-if="item.activityType == 1" src="../../static/images/groupBuyIcon.png">
-                  <img class="iconImg" v-if="item.activityType == 2" src="../../static/images/spikeIcon.png">
-                  <img class="iconImg" v-if="item.activityType == 4" src="../../static/images/spikeIcon.png">
-                  <img class="iconImg" v-if="item.activityType == 3" src="../../static/images/discountListIcon.png">
-                  <img class="iconImg" v-if="item.activityType == 5" src="../../static/images/discountListIcon.png">
-                  <img class="iconImg" v-if="item.activityType == 8" src="../../static/images/memberCenterIcon.png">
+                  <img class="iconImg" v-if="item.activityType == 1" src="https://ceres.zkthink.com/static/images/groupBuyIcon.png">
+                  <img class="iconImg" v-if="item.activityType == 2" src="https://ceres.zkthink.com/static/images/spikeIcon.png">
+                  <img class="iconImg" v-if="item.activityType == 4" src="https://ceres.zkthink.com/static/images/spikeIcon.png">
+                  <img class="iconImg" v-if="item.activityType == 3" src="https://ceres.zkthink.com/static/images/discountListIcon.png">
+                  <img class="iconImg" v-if="item.activityType == 5" src="https://ceres.zkthink.com/static/images/discountListIcon.png">
+                  <img class="iconImg" v-if="item.activityType == 8" src="https://ceres.zkthink.com/static/images/memberCenterIcon.png">
                   <div class="price">
                     ¥ {{item.price}}
                   </div>
@@ -252,7 +252,7 @@ export default {
     .coupon{
       margin: 32rpx 20rpx;
       height: 140rpx;
-      background: #333333 url("../../static/img/channelCoupon/border-coupon.png") no-repeat right center / auto 140rpx;
+      background: #333333 url("https://ceres.zkthink.com/static/img/channelCoupon/border-coupon.png") no-repeat right center / auto 140rpx;
       display: flex;
       .price{
         position: relative;

+ 3 - 3
pages_category_page2/distributionModule/distributionOrder.vue

@@ -11,8 +11,8 @@
 							</view>
 						</view>
             <view>
-              <image v-if="item.ifOpen  == false" class="arrow-down" src="../../static/images/arrowDownIcon.png"></image>
-              <image v-if="item.ifOpen  == true" class="arrow-down" src="../../static/images/arrowUpIcon.png"></image>
+              <image v-if="item.ifOpen  == false" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowDownIcon.png"></image>
+              <image v-if="item.ifOpen  == true" class="arrow-down" src="https://ceres.zkthink.com/static/images/arrowUpIcon.png"></image>
             </view>
 					</view>
 					<view class="upBox" v-if="item.ifOpen == true">
@@ -29,7 +29,7 @@
 			</view>
 		</view>
 		<view v-else class="emptyCart-box flex-items-plus flex-column">
-			<image class="emptyCart-img" src="../../static/img/bgnull.png"></image>
+			<image class="emptyCart-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 			<label class="font-color-999 fs26 mar-top-30">这里空空如也~</label>
 		</view>
 	</view>

+ 2 - 2
pages_category_page2/livePage/components/liveBox.vue

@@ -4,7 +4,7 @@
       <image class="cover-img" :src="liveData.feedsImg" />
       <view class="status">
         <view class="status-state">
-          <image class="img" src="../../../static/img/live/icon-live-num.png" />直播中
+          <image class="img" src="https://ceres.zkthink.com/static/img/live/icon-live-num.png" />直播中
         </view>
         <!-- <view class="status-num">1000人</view> -->
       </view>
@@ -49,7 +49,7 @@
         <view class="user-name">{{ liveData.anchorNickName }}</view>
       </view>
       <view class="count-down" v-if="liveStatus === 102">
-        <image v-if="isLate" class="img" src="@/static/img/live/live-late.png"/>
+        <image v-if="isLate" class="img" src="../../../static/images/live/live-late.png"/>
         <view class="text">{{ liveTimeTitle }}</view>
         <view v-if="!isLate" class="time">
           <view class="time-item">{{times[0]}}</view>

+ 1 - 1
pages_category_page2/livePage/index.vue

@@ -8,7 +8,7 @@
 			/>
 		</view>
     <view v-else class="emptyCart-box">
-      <image class="emptyCart-img" src="@/static/images/collectEmpty.png"></image>
+      <image class="emptyCart-img" src="https://ceres.zkthink.com/static/images/collectEmpty.png"></image>
       <label class="text font-color-999 fs26 mar-top-30">暂无直播~</label>
     </view>
 	</view>

+ 3 - 3
pages_category_page2/orderModule/afterSale.vue

@@ -9,10 +9,10 @@
 							<view class="top-l" @click="goShop(item.shopId)">
 								<image :src="item.shopLogo" class="shop-img"></image>
 								<text class="shop-name">{{item.shopName}}</text>
-								<image src="../../static/images/arrowRight.png" class="arrow-img"></image>
+								<image src="https://ceres.zkthink.com/static/images/arrowRight.png" class="arrow-img"></image>
 							</view>
 							<view class="top-r">
-								<image src="../../static/images/afterSaleTuikuan.png" class="order-status-img"></image>
+								<image src="https://ceres.zkthink.com/static/images/afterSaleTuikuan.png" class="order-status-img"></image>
 								<text class="order-status">{{item.afterType==1?'退款':'退货'}}</text>
 							</view>
 						</view>
@@ -72,7 +72,7 @@
 					</view>
 				</view>
 				<view v-if="ifEmpty" class="emptyCart-box flex-items-plus flex-column">
-					<image class="emptyCart-img" src="../../static/img/bgnull.png"></image>
+					<image class="emptyCart-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 					<label class="font-color-999 fs26 mar-top-30">暂无售后记录~</label>
 				</view>
 			</view>

+ 9 - 9
pages_category_page2/orderModule/refundDetails.vue

@@ -8,7 +8,7 @@
 						<text class="status">审核中</text>
 						<!-- <text class="label" v-if="deliveryfalse">还剩1天22时30分</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsTime.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsTime.png"></image>-->
 				</view>
 				<!--  审核通过-->
 				<view class="status-title-box" v-if="status == 10">
@@ -16,7 +16,7 @@
 						<text class="status">审核通过</text>
 						<!-- <text class="label" v-if="deliveryfalse">2020年4月24日 22:00:00</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsSuccess.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsSuccess.png"></image>-->
 				</view>
 				<!--  审核不通过-->
 				<view class="status-title-box" v-if="status == 6">
@@ -24,7 +24,7 @@
 						<text class="status">审核不通过</text>
 						<!-- <text class="label" v-if="deliveryfalse">2020年4月24日 22:00:00</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsSuccess.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsSuccess.png"></image>-->
 				</view>
         <view class="reason" v-if="status == 6">原因: {{ itemlist.reason }}</view>
 				<!--  退款中-->
@@ -33,14 +33,14 @@
 						<text class="status">退款中</text>
 						<!-- <text class="label">2020年4月24日 22:00:00</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsFalse.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsFalse.png"></image>-->
 				</view>
         <!--  退款中-->
         <view class="status-title-box" v-if="status == 7">
           <view class="l">
             <text class="status">评审中</text>
           </view>
-<!--          <image class='r' src="../../static/images/afterSaleDetailsFalse.png"></image>-->
+<!--          <image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsFalse.png"></image>-->
         </view>
 				<!--  退货完成待退款-->
 				<view class="status-title-box" v-if="status == 4">
@@ -48,7 +48,7 @@
 						<text class="status">退款成功</text>
 						<!-- <text class="label">2020年4月24日 22:00:00</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsFalse.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsFalse.png"></image>-->
 				</view>
 				<!--  退货完成拒绝退款-->
 				<view class="status-title-box" v-if="status == 5">
@@ -56,7 +56,7 @@
 						<text class="status">退款失败</text>
 						<!-- <text class="label">2020年4月24日 22:00:00</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsFalse.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsFalse.png"></image>-->
 				</view>
 				<!--  退款成功-->
 				<view class="status-title-box" v-if="status == 9">
@@ -64,7 +64,7 @@
 						<text class="status">撤销申请</text>
 						<!-- <text class="label" v-if="deliveryfalse">2020年4月24日 22:00:00</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsSuccess.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsSuccess.png"></image>-->
 				</view>
 
 			</view>
@@ -268,7 +268,7 @@ page {
 .order-details-status {
   width: 100%;
   height: 302upx;
-  background: url("../../static/images/refundBg.png") no-repeat left top;
+  background: url("https://ceres.zkthink.com/static/images/refundBg.png") no-repeat left top;
   background-size: contain;
 }
 

+ 12 - 12
pages_category_page2/orderModule/returnDetails.vue

@@ -8,14 +8,14 @@
 						<text class="status">无退货</text>
 						<!-- <text class="label" v-if="deliveryfalse">还剩1天22时30分</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsTime.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsTime.png"></image>-->
 				</view>
 				<view class="status-title-box" v-if='status == 1'>
 					<view class="l">
 						<text class="status">退货审核中</text>
 						<!-- <text class="label" v-if="deliveryfalse">还剩1天22时30分</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsTime.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsTime.png"></image>-->
 				</view>
 				<!--  审核通过-->
 				<view class="status-title-box" v-if="status == 10">
@@ -23,7 +23,7 @@
 						<text class="status">审核通过</text>
 						<!-- <text class="label" v-if="deliveryfalse">2020年4月24日 22:00:00</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsSuccess.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsSuccess.png"></image>-->
 				</view>
 				<!--  审核通过-->
 				<view class="status-title-box" v-if="status == 6">
@@ -31,14 +31,14 @@
 						<text class="status">审核不通过</text>
 						<!-- <text class="label" v-if="deliveryfalse">2020年4月24日 22:00:00</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsSuccess.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsSuccess.png"></image>-->
 				</view>
         <!--  审核中-->
         <view class="status-title-box" v-if="status == 7">
           <view class="l">
             <text class="status">退货中</text>
           </view>
-<!--          <image class='r' src="../../static/images/afterSaleDetailsFalse.png"></image>-->
+<!--          <image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsFalse.png"></image>-->
         </view>
 				<!--  退货中-->
 				<view class="status-title-box" v-if="status == 3">
@@ -46,7 +46,7 @@
 						<text class="status">退货中</text>
 						<!-- <text class="label">2020年4月24日 22:00:00</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsFalse.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsFalse.png"></image>-->
 				</view>
 				<!--  退货完成拒绝退款-->
 				<view class="status-title-box" v-if="status == 8">
@@ -54,7 +54,7 @@
 						<text class="status">退货完成,拒绝退款</text>
 						<!-- <text class="label">2020年4月24日 22:00:00</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsFalse.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsFalse.png"></image>-->
 				</view>
 				<!--  退款成功-->
 				<view class="status-title-box" v-if="status == 4">
@@ -62,7 +62,7 @@
 						<text class="status">已退款</text>
 						<!-- <text class="label" v-if="deliveryfalse">2020年4月24日 22:00:00</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsSuccess.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsSuccess.png"></image>-->
 				</view>
 				<!-- 退款中 -->
 				<view class="status-title-box" v-if="status == 2">
@@ -70,7 +70,7 @@
 						<text class="status">退款中</text>
 						<!-- <text class="label" v-if="deliveryfalse">2020年4月24日 22:00:00</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsSuccess.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsSuccess.png"></image>-->
 				</view>
 				<!-- 退款失败 -->
 				<view class="status-title-box" v-if='status == 5'>
@@ -78,7 +78,7 @@
 						<text class="status">退款失败</text>
 						<!-- <text class="label" v-if="deliveryfalse">还剩1天22时30分</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsTime.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsTime.png"></image>-->
 				</view>
 				<!-- 退款关闭 -->
 				<view class="status-title-box" v-if='status == 9'>
@@ -86,7 +86,7 @@
 						<text class="status">退货关闭</text>
 						<!-- <text class="label" v-if="deliveryfalse">还剩1天22时30分</text> -->
 					</view>
-<!--					<image class='r' src="../../static/images/afterSaleDetailsTime.png"></image>-->
+<!--					<image class='r' src="https://ceres.zkthink.com/static/images/afterSaleDetailsTime.png"></image>-->
 				</view>
 			</view>
 
@@ -98,7 +98,7 @@
 			    <view class="address-box">
 			      <view>商家已同意退货申请,请尽早发货。</view>
 			      <view class="address-info">
-			        <image src="../../static/images/expressSiteIcon.png" class="address-img"></image>
+			        <image src="https://ceres.zkthink.com/static/images/expressSiteIcon.png" class="address-img"></image>
 			        <view class="address-info-r">
 			          <view class="item">
 			            <text><text class="title">收货人</text>:</text>

+ 3 - 3
pages_category_page2/userModule/accountLogin.vue

@@ -2,11 +2,11 @@
 	<!-- 登录 -->
 	<view class="container flex-items-plus flex-column">
 		<view class="login-logoBox">
-			<image class="login-logo" src="../../static/images/loginLogo.png"></image>
+			<image class="login-logo" src="https://ceres.zkthink.com/static/images/loginLogo.png"></image>
 		</view>
 		<view class="iphoneNum-box flex-row-plus flex-items">
 			<view style="margin-right: 30rpx">
-        <image class="loginIcon" src="../../static/images/phone.png"></image>
+        <image class="loginIcon" src="https://ceres.zkthink.com/static/images/phone.png"></image>
 			</view>
 			<view>
 				<input v-model="loginQuery.account" placeholder-class="iphoneNum-input" type="number"
@@ -16,7 +16,7 @@
 		<view class="flex-row-plus mar-top-20">
 			<view class="code-box">
 				<view style="margin-right: 30rpx">
-          <image class="loginIcon" src="../../static/images/code.png"></image>
+          <image class="loginIcon" src="https://ceres.zkthink.com/static/images/code.png"></image>
 				</view>
 				<view>
 					<input v-model="loginQuery.code" placeholder-class="codeNum-input" placeholder="请输入验证码" />

+ 3 - 3
pages_category_page2/userModule/addAddress.vue

@@ -4,7 +4,7 @@
     <!-- #ifdef MP-WEIXIN -->
 <!--    <view class="wxAddress flex-items flex-end" v-if="type == 1">-->
 <!--      <view class="wxBtnBox flex-items" @click="addAddressWx">-->
-<!--        <image class="" src="../../static/images/withdraw.png"></image>-->
+<!--        <image class="" src="https://ceres.zkthink.com/static/images/withdraw.png"></image>-->
 <!--      </view>-->
 <!--    </view>-->
     <!-- #endif -->
@@ -21,7 +21,7 @@
 <!--					<city-select v-model="locationShowFalg" @city-change="cityChange"></city-select>-->
           <u-picker-cere mode="region" v-model="locationShowFalg" @confirm="cityChange" :default-region='addressData.defaultRegion' title="所在地"></u-picker-cere>
 					<text v-model="addressData.ssqText">{{addressData.ssqText}}</text>
-					<image class="arrow mar-left-20" src="../../static/images/greyArrow.png"></image>
+					<image class="arrow mar-left-20" src="https://ceres.zkthink.com/static/images/greyArrow.png"></image>
 				</view>
 			</view>
 			<view class="detailAddress-box">
@@ -33,7 +33,7 @@
 				<view class="fs28 addressTag">地址标签</view>
 				<view class="flex-items">
 					<text v-model="tag">{{tag}}</text>
-					<image class="arrow mar-left-20" src="../../static/images/greyArrow.png"></image>
+					<image class="arrow mar-left-20" src="https://ceres.zkthink.com/static/images/greyArrow.png"></image>
 				</view>
 			</view>
 			<view class="defaultState-box flex-row-plus flex-sp-between flex-items">

+ 3 - 3
pages_category_page2/userModule/address.vue

@@ -19,14 +19,14 @@
 			</view>
 		</view>
 		<view v-if="ifEmpty" class="emptyAddress-box">
-			<image class="emptyAddress" src="../../static/img/noAddress.png"></image>
+			<image class="emptyAddress" src="https://ceres.zkthink.com/static/img/noAddress.png"></image>
 			<text>你还没有添加地址哦~</text>
 		</view>
     <!-- #ifdef MP-WEIXIN -->
     <view class="wxAddressNBox">
       <view class="flex-items btnBox flex-sp-between">
         <view class="wxAddress btn flex-items flex-center" @click="wxAddFn">
-          <image src="../../static/images/weixin2x.png"></image>
+          <image src="https://ceres.zkthink.com/static/images/weixin2x.png"></image>
           <text>微信导入</text>
         </view>
         <view class="addAddressBtn btn" @click="addAddressClick">添加新地址</view>
@@ -305,7 +305,7 @@
       width: 50rpx;
       height: 50rpx;
       display: block;
-      background: url("../../static/images/addEdit.png") no-repeat center center;
+      background: url("https://ceres.zkthink.com/static/images/addEdit.png") no-repeat center center;
       background-size: contain;
     }
 	}

+ 3 - 3
pages_category_page2/userModule/bankcard.vue

@@ -16,7 +16,7 @@
 			</view>
 		</view>
 		<view v-if="ifEmpty" class="emptyBankcard-box">
-			<image class="emptyBankcard" src="../../static/img/bgnull.png"></image>
+			<image class="emptyBankcard" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 			<label>你还没有添加银行卡哦~</label>
 		</view>
 		<view class="addBankcard-box">
@@ -115,7 +115,7 @@
 <style lang="scss">
 	.container{
 		.bankcardList {
-      background: url("../../static/images/addBankBg.png") no-repeat left top;
+      background: url("https://ceres.zkthink.com/static/images/addBankBg.png") no-repeat left top;
       background-size: contain;
 			display: block;
 			padding-bottom: 85px;
@@ -157,7 +157,7 @@
 			.bankcard-detail {
 				width: 100%;
 				height: 334rpx;
-				background: url("../../static/images/accountBg.png") no-repeat left top;
+				background: url("https://ceres.zkthink.com/static/images/accountBg.png") no-repeat left top;
         background-size: contain;
         border-radius: 18rpx;
 				.bankname {

+ 3 - 3
pages_category_page2/userModule/bindPhone.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container flex-items-plus flex-column">
 		<view class="login-logoBox">
-			<image class="login-logo" src="../../static/images/loginLogo.png"></image>
+			<image class="login-logo" src="https://ceres.zkthink.com/static/images/loginLogo.png"></image>
 		</view>
     <view class="loginInfo fs26 font-color-999">
       <p>共建真实、安全的交易环境</p>
@@ -18,7 +18,7 @@
 		<view class="phoneVerify" v-if="verifyType == 1">
       <view class="iphoneNum-box flex-row-plus flex-items">
         <view style="margin-right: 30rpx">
-          <image class="loginIcon" src="../../static/images/phone.png"></image>
+          <image class="loginIcon" src="https://ceres.zkthink.com/static/images/phone.png"></image>
         </view>
         <view>
           <input v-model="phone" placeholder-class="iphoneNum-input" type="number" placeholder="请输入您的手机号" />
@@ -27,7 +27,7 @@
       <view class="flex-row-plus mar-top-20">
         <view class="code-box">
           <view style="margin-right: 30rpx">
-            <image class="loginIcon" src="../../static/images/code.png"></image>
+            <image class="loginIcon" src="https://ceres.zkthink.com/static/images/code.png"></image>
           </view>
           <view>
             <input v-model="code" placeholder-class="codeNum-input" placeholder="请输入验证码" />

+ 20 - 20
pages_category_page2/userModule/collection.vue

@@ -17,7 +17,7 @@
 				<view class="wid function-box">
 					<view class="finishbox" @click="finishClick" v-if="allCheckShow">完成</view>
 					<view v-else class="flex-row-plus editicon-box flex-items fs28" @click="editClick">
-						<image class="editicon" src="../../static/images/collectionEditicon.png"></image>
+						<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png"></image>
 						<text class="mar-left-10">编辑</text>
 					</view>
 				</view>
@@ -39,10 +39,10 @@
                 <view class="item wid flex-row-plus flex-display">
                   <view class="flex-items selctBtn" v-show="allCheckShow">
                     <image mode="aspectFill" v-if="item.selected == 1"
-                           @click.stop="productItemSel(index,0)" src="../../static/images/selectActive.png"
+                           @click.stop="productItemSel(index,0)" src="https://ceres.zkthink.com/static/images/selectActive.png"
                            class="cart-select-img"></image>
                     <image mode="aspectFill" v-else @click.stop="productItemSel(index,1)"
-                           src="../../static/images/selectEmpty.png" class="cart-select-img"></image>
+                           src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img"></image>
                   </view>
                   <view class="infoCent flex-items">
                     <image class="product-img" mode="aspectFill" :src="item.image" />
@@ -65,9 +65,9 @@
 				<view v-if="allCheckShow" class="pad-bot-140"></view>
 				<view v-show="allCheckShow" class="allcheck-box flex-row-plus flex-sp-between flex-items">
 					<view class="left">
-						<image mode="aspectFill" v-if="isAllProCheck" src="../../static/images/selectActive.png"
+						<image mode="aspectFill" v-if="isAllProCheck" src="https://ceres.zkthink.com/static/images/selectActive.png"
 							class="cart-select-img" @click="allProductSel(0)"></image>
-						<image mode="aspectFill" v-else src="../../static/images/selectEmpty.png"
+						<image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png"
 							class="cart-select-img" @click="allProductSel(1)"></image>
 						<text>全选</text>
 					</view>
@@ -78,7 +78,7 @@
 				<view v-if="allCheckShow" class="pad-bot-140"></view>
 			</view>
 			<view v-if="productCollect.length==0&&proCollectShow" class="mar-top-60 empty-box">
-				<image class="collect-empty" src="../../static/images/collectEmpty.png"></image>
+				<image class="collect-empty" src="https://ceres.zkthink.com/static/images/collectEmpty.png"></image>
 				<view class="tohome-box flex-items-plus">暂无收藏</view>
 			</view>
 		</view>
@@ -86,7 +86,7 @@
 			<view v-if="storeCollect.length>0">
 				<view class="finishbox" @click="finishClick" v-if="allCheckShow">完成</view>
 				<view v-else class="flex-row-plus editicon-box flex-items fs28" @click="editClick">
-					<image class="editicon" src="../../static/images/collectionEditicon.png"></image>
+					<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png"></image>
 					<text class="mar-left-10">编辑</text>
 				</view>
 				<view class="swipe-box swipeBox">
@@ -106,9 +106,9 @@
                 <view v-show="allCheckShow" class="selctBtn flex-items">
                   <image mode="aspectFill" v-if="item.selected == 1"
                          @click.stop="storeItemSel(index,0)"
-                         src="../../static/images/selectActive.png" class="cart-select-img"></image>
+                         src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"></image>
                   <image mode="aspectFill" v-else @click.stop="storeItemSel(index,1)"
-                         src="../../static/images/selectEmpty.png" class="cart-select-img"></image>
+                         src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img"></image>
                 </view>
                 <view class="infoCent">
                   <view class="flex-row-plus flex-sp-between flex-items-plus wid">
@@ -122,7 +122,7 @@
                     </view>
                     <view class="toStore flex-items-plus fs24" @click="toStoreClick(item.shopId)">
                       进入店铺
-                      <image src="../../static/images/arrowR.png"></image>
+                      <image src="https://ceres.zkthink.com/static/images/arrowR.png"></image>
                     </view>
                   </view>
                   <view class="shopImgBox">
@@ -137,9 +137,9 @@
 				</view>
 				<view v-show="allCheckShow" class="allcheck-box flex-row-plus flex-sp-between flex-items">
 					<view class="left">
-						<image mode="aspectFill" v-if="isAllStoreCheck" src="../../static/images/selectActive.png"
+						<image mode="aspectFill" v-if="isAllStoreCheck" src="https://ceres.zkthink.com/static/images/selectActive.png"
 							class="cart-select-img" @click="allStoreSel(0)"></image>
-						<image mode="aspectFill" v-else src="../../static/images/selectEmpty.png"
+						<image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png"
 							class="cart-select-img" @click="allStoreSel(1)"></image>
 						<text>全选</text>
 					</view>
@@ -150,7 +150,7 @@
 				<view v-if="allCheckShow" class="pad-bot-140"></view>
 			</view>
 			<view v-if="storeCollect.length==0&&storeCollectShow" class="mar-top-60 empty-box">
-				<image class="collect-empty" src="../../static/images/collectEmpty.png"></image>
+				<image class="collect-empty" src="https://ceres.zkthink.com/static/images/collectEmpty.png"></image>
 				<view class="tohome-box flex-items-plus">暂无收藏</view>
 			</view>
 		</view>
@@ -173,7 +173,7 @@
 				</view>
 			</view>
 			<view v-if="cardModal" @click="cardModal = false" class="cancelDel">
-				<image src="../../static/images/cancelClose.png" mode=""></image>
+				<image src="https://ceres.zkthink.com/static/images/cancelClose.png" mode=""></image>
 			</view>
 		</tui-modal>
 	</view>
@@ -190,11 +190,11 @@
 		data() {
 			return {
 				imgs: [
-					'../../static/images/groupBuyIcon.png',
-					'../../static/images/spikeIcon.png',
-					'../../static/images/discountListIcon.png',
-					'../../static/images/spikeIcon.png',
-					'../../static/images/discountListIcon.png',
+					'https://ceres.zkthink.com/static/images/groupBuyIcon.png',
+					'https://ceres.zkthink.com/static/images/spikeIcon.png',
+					'https://ceres.zkthink.com/static/images/discountListIcon.png',
+					'https://ceres.zkthink.com/static/images/spikeIcon.png',
+					'https://ceres.zkthink.com/static/images/discountListIcon.png',
 				],
 				collectionTypeList: [{
 					name: '商品'
@@ -788,7 +788,7 @@
 		width: 60rpx;
 		height: 60rpx;
 		display: block;
-		background: url("../../static/images/delIcon.png") no-repeat center center;
+		background: url("https://ceres.zkthink.com/static/images/delIcon.png") no-repeat center center;
 		background-size: contain;
 	}
 </style>

+ 3 - 3
pages_category_page2/userModule/coupon.vue

@@ -17,13 +17,13 @@
 				</view>
 			</view>
       <view v-if="ifEmpty" class="emptyOrder-box flex-items-plus flex-column">
-        <image class="emptyOrder-img" src="../../static/img/bgnull.png"></image>
+        <image class="emptyOrder-img" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
         <label class="font-color-999 fs26 mar-top-30">你还没有优惠券哦~</label>
       </view>
 		</view>
 		<!-- 触底 -->
     <view class="reachBottom" v-if="topLeft > 400 && list.length > 0">
-			<image class="reach-icon" src="@/static/img/reachBottom.png" mode="widthFix"></image>
+			<image class="reach-icon" src="https://ceres.zkthink.com/static/img/reachBottom.png" mode="widthFix"></image>
 			<text class="reach-text">这里到底了哦~~</text>
 		</view>
 	</view>
@@ -102,7 +102,7 @@
 .item {
   width: 50%;
   height: 291rpx;
-  background: url("../../static/images/couponsIcon.png") no-repeat center top;
+  background: url("https://ceres.zkthink.com/static/images/couponsIcon.png") no-repeat center top;
   border-radius: 10rpx;
   margin-top: 20rpx;
   display: flex;

+ 7 - 7
pages_category_page2/userModule/footprintList.vue

@@ -4,7 +4,7 @@
 			<view class="wid function-box">
 				<view class="finishbox" @click="finishClick" v-if="allCheckShow">完成</view>
 				<view v-else class="flex-row-plus editicon-box flex-items fs28" @click="editClick">
-					<image class="editicon" src="../../static/images/collectionEditicon.png"></image>
+					<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png"></image>
 					<label class="mar-left-10">编辑</label>
 				</view>
 			</view>
@@ -17,8 +17,8 @@
             <view class="itemBox">
               <view @click.stop="toGoodsDetails(item.productId,item.shopId,item.skuId)" class="item wid flex-display">
                 <view v-show="allCheckShow" class="selectIconBox">
-                  <image v-if="item.selected == 1" @click.stop="footItemSel(index,findex,0)" src="../../static/images/selectActive.png" class="cart-select-img"></image>
-                  <image v-else @click.stop="footItemSel(index,findex,1)" src="../../static/images/selectEmpty.png" class="cart-select-img"></image>
+                  <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" mode="aspectFill" :src="item.image" />
                 <!-- 此层wrap在此为必写的,否则可能会出现标题定位错误 -->
@@ -36,8 +36,8 @@
 			</view>
 			<view v-show="allCheckShow" class="allcheck-box flex-row-plus flex-sp-between flex-items">
 				<view class="left">
-					<image v-if="isAllCheck" src="../../static/images/selectActive.png" class="cart-select-img" @click="allSel(0)"></image>
-					<image v-else src="../../static/images/selectEmpty.png" class="cart-select-img" @click="allSel(1)"></image>
+					<image v-if="isAllCheck" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img" @click="allSel(0)"></image>
+					<image v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img" @click="allSel(1)"></image>
 					<text>全选</text>
 				</view>
 				<view class="right">
@@ -47,7 +47,7 @@
 			<view v-if="allCheckShow" class="pad-bot-140"></view>
 		</view>
 		<view v-else class="mar-top-60 empty-box" @click="goToIndex">
-			<image class="footprint-empty" src="../../static/img/bgnull.png"></image>
+			<image class="footprint-empty" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 			<view class="tohome-box flex-items-plus">去首页逛逛</view>
 		</view>
 	</view>
@@ -390,7 +390,7 @@ page {
    width: 60rpx;
    height: 60rpx;
    display: block;
-   background: url("../../static/images/delIcon.png") no-repeat center center;
+   background: url("https://ceres.zkthink.com/static/images/delIcon.png") no-repeat center center;
    background-size: contain;
  }
 </style>

+ 1 - 1
pages_category_page2/userModule/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container flex-items-plus flex-column">
 		<view class="login-logoBox">
-			<image class="login-logo" src="../../static/images/loginLogo.png"></image>
+			<image class="login-logo" src="https://ceres.zkthink.com/static/images/loginLogo.png"></image>
 		</view>
 		<view class="loginTitle-text flex-column-plus flex-items font-color-666 fs26">
 			<text>为了给您提供更好的服务</text>

+ 4 - 4
pages_category_page2/userModule/memberAccount.vue

@@ -12,9 +12,9 @@
     </view>
 		<view class="balance-operation">
 			<view class="item-btn" @click="memberAccountWithdraw">
-				<image class="item-btn-icon" src="../../static/images/withdraw.png" mode="widthFix"></image>
+				<image class="item-btn-icon" src="https://ceres.zkthink.com/static/images/withdraw.png" mode="widthFix"></image>
 				<view class="item-btn-text">提现</view>
-				<image class="item-btn-right" src="../../static/images/greyArrow.png" mode="widthFix"></image>
+				<image class="item-btn-right" src="https://ceres.zkthink.com/static/images/greyArrow.png" mode="widthFix"></image>
 			</view>
 		</view>
 	</view>
@@ -84,14 +84,14 @@ page {
 		.balance{
 			display: block;
 			height: 400rpx;
-			background: url("../../static/images/bankBg.png") no-repeat left top;
+			background: url("https://ceres.zkthink.com/static/images/bankBg.png") no-repeat left top;
       background-size: cover;
 			text-align:center;
       padding: 100rpx 20rpx 0 20rpx;
 		}
     .balanceInfo {
       width: 712rpx;
-      background: url("../../static/images/accountBg.png") no-repeat left top;
+      background: url("https://ceres.zkthink.com/static/images/accountBg.png") no-repeat left top;
       height: 342rpx;
       background-size: cover;
       margin: -300rpx auto 0 auto;

+ 8 - 10
pages_category_page2/userModule/messageCenter.vue

@@ -16,14 +16,14 @@
 						<view class="messageType">
 							<view v-if="item.noticeType == 1" class="messageTypeL">
 								<view class="iconBox">
-									<image src="../../static/images/notice.png" alt=""></image>
+									<image src="https://ceres.zkthink.com/static/images/notice.png" alt=""></image>
 									<view class="redBox" v-if="item.ifRead ===0"></view>
 								</view>
 								<span>订单消息</span>
 							</view>
 							<view v-else class="messageTypeL">
 								<view class="iconBox">
-									<image src="../../static/images/notice.png" alt=""></image>
+									<image src="https://ceres.zkthink.com/static/images/notice.png" alt=""></image>
 								</view>
 								<span>系统公告</span>
 							</view>
@@ -41,7 +41,7 @@
 			</u-swipe-action>
 		</view>
 		<view v-if="ifEmpty" class="mar-top-60 empty-box">
-			<image class="question-empty" src="../../static/img/bgnull.png"></image>
+			<image class="question-empty" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 			<view class="tohome-box flex-items-plus">暂无消息</view>
 		</view>
 	</view>
@@ -333,13 +333,11 @@
 					}
 				}
 				.messageInfo {
-					width: 680upx;
-					word-wrap: break-word;
+					width: 670upx;
+					display: block;
 					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
+					text-overflow:ellipsis;
+					white-space: nowrap;
 					margin: 20upx 40upx 20upx;
 					img {
 						width: 100%;
@@ -368,7 +366,7 @@
 					display: block;
 					width: 28upx;
 					height: 28upx;
-					background: url("../../static/images/arrowRight.png") no-repeat center center;
+					background: url("https://ceres.zkthink.com/static/images/arrowRight.png") no-repeat center center;
 					background-size: contain;
 				}
 			}

+ 1 - 1
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="../../static/images/loginLogo.png"></image>
+			<image class="login-logo" src="https://ceres.zkthink.com/static/images/loginLogo.png"></image>
 		</view>
 		<view class="loginTitle-text flex-column-plus flex-items font-color-666 fs26">
 			<label>为了给您提供更好的服务</label>

+ 29 - 47
pages_category_page2/userModule/personalDetails.vue

@@ -5,7 +5,7 @@
 			<view class="personalHead-box flex-sp-between flex-display flex-items">
 				<label>头像</label>
 				<image class="user-headImg" v-if="item.headImage" :src="item.headImage"></image>
-				<image class="user-headImg" v-else src="../../static/img/user/morentouxiang.png"></image>
+				<image class="user-headImg" v-else src="https://ceres.zkthink.com/static/img/user/morentouxiang.png"></image>
 			</view>
 		</view>
 		<view class="personalBack-box flex-items-plus flex-column">
@@ -13,8 +13,9 @@
 				<label>昵称</label>
 <!--				<label class="font-color-999" v-if="item.name">{{item.name}}</label>-->
 <!--        <label class="font-color-999" v-else>{{item.phone}}</label>-->
-        <input class="nameInput" v-if="name" v-model="name" type="text" placeholder="请输入内容" @blur="changeName(1)" />
-        <input class="nameInput" v-else type="text" v-model="phone" placeholder="请输入内容" @blur="changeName(2)" />
+        <!-- <input class="nameInput" v-if="name" v-model="name" type="text" placeholder="请输入内容" @blur="changeName(1)" /> -->
+        <!-- <input class="nameInput" v-else type="text" v-model="phone" placeholder="请输入内容" @blur="changeName(2)" /> -->
+				<input class="nameInput" v-model="name" type="text" placeholder="请输入内容" @blur="changeName" />
 			</view>
 			<view class="personalHead-box flex-sp-between flex-display flex-items" @click="sexShowClick">
 				<label>性别</label>
@@ -137,50 +138,31 @@
 				}
 			},
       // 修改昵称
-      changeName(type) {
-        if (type === 1) {
-          if (this.item.name !== this.name) {
-            uni.showLoading({
-              mask: true,
-              title: "正在加载中"
-            })
-            NET.request(API.UpdateUser, {
-              name: this.name
-            }, 'POST').then(res => {
-              this.GetUser()
-              uni.hideLoading()
-              uni.showToast({
-                title: '修改成功',
-                icon: "success"
-              })
-            }).catch(res => {
-              uni.hideLoading()
-            })
-          } else {
-            return false
-          }
-        } else {
-          if (this.item.phone !== this.phone) {
-            uni.showLoading({
-              mask: true,
-              title: "正在加载中"
-            })
-            NET.request(API.UpdateUser, {
-              name: this.phone
-            }, 'POST').then(res => {
-              this.GetUser()
-              uni.hideLoading()
-              uni.showToast({
-                title: '修改成功',
-                icon: "success"
-              })
-            }).catch(res => {
-              uni.hideLoading()
-            })
-          } else {
-            return false
-          }
-        }
+      changeName() {
+				const newName = this.name || this.phone
+				if (!newName) {
+					uni.showToast({
+						title: '请输入新的内容',
+						icon: "none"
+					})
+					return false
+				}
+				uni.showLoading({
+					mask: true,
+					title: "正在加载中"
+				})
+				NET.request(API.UpdateUser, {
+					name: newName
+				}, 'POST').then(res => {
+					this.GetUser()
+					uni.hideLoading()
+					uni.showToast({
+						title: '修改成功',
+						icon: "success"
+					})
+				}).catch(res => {
+					uni.hideLoading()
+				})
       },
 			// 提交修改生日
 			ConfirmTime(content) {

+ 16 - 16
pages_category_page2/userModule/questionList.vue

@@ -9,7 +9,7 @@
 				<view class="wid function-box">
 					<view class="finishbox" @click="finishClick" v-if="allCheckShow">完成</view>
 					<view v-else class="flex-row-plus editicon-box flex-items fs28" @click="editClick">
-						<image class="editicon" src="../../static/images/collectionEditicon.png"></image>
+						<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png"></image>
 						<text class="mar-left-10">编辑</text>
 					</view>
 				</view>
@@ -22,8 +22,8 @@
 						<view class="flex-item itemBox" @click="goQuestionDetails(item.productId,item.problemId)">
 							<view class="item u-border-bottom wid flex-row-plus flex-items">
 								<view v-show="allCheckShow">
-									<image mode="aspectFill" v-if="item.selected == 1" @click.stop="problemItemSel(index,0)" src="../../static/images/selectActive.png" class="cart-select-img"></image>
-									<image mode="aspectFill" v-else @click.stop="problemItemSel(index,1)" src="../../static/images/selectEmpty.png" class="cart-select-img"></image>
+									<image mode="aspectFill" v-if="item.selected == 1" @click.stop="problemItemSel(index,0)" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"></image>
+									<image mode="aspectFill" v-else @click.stop="problemItemSel(index,1)" src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img"></image>
 								</view>
 <!--								<image class="product-img" mode="aspectFill" :src="item.image" />-->
 								<!-- 此层wrap在此为必写的,否则可能会出现标题定位错误 -->
@@ -45,8 +45,8 @@
 				</view>
 				<view v-show="allCheckShow" class="allcheck-box flex-row-plus flex-sp-between flex-items">
 					<view class="left">
-						<image mode="aspectFill" v-if="isAllProblemCheck" src="../../static/images/selectActive.png" class="cart-select-img" @click="allProblemSel(0)"></image>
-						<image mode="aspectFill" v-else src="../../static/images/selectEmpty.png" class="cart-select-img" @click="allProblemSel(1)"></image>
+						<image mode="aspectFill" v-if="isAllProblemCheck" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img" @click="allProblemSel(0)"></image>
+						<image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img" @click="allProblemSel(1)"></image>
 						<text>全选</text>
 					</view>
 					<view class="right">
@@ -56,7 +56,7 @@
 				<view v-if="allCheckShow" class="pad-bot-140"></view>
 			</view>
 			<view v-if="ifEmpty" class="mar-top-60 empty-box">
-				<image class="question-empty" src="../../static/img/bgnull.png"></image>
+				<image class="question-empty" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 				<view class="tohome-box flex-items-plus">暂无提问内容</view>
 			</view>
 		</view>
@@ -64,7 +64,7 @@
 			<view>
 				<view class="finishbox" @click="finishClick" v-if="allCheckShow">完成</view>
 				<view v-else class="flex-row-plus editicon-box flex-items fs28" @click="editClick">
-					<image class="editicon" src="../../static/images/collectionEditicon.png"></image>
+					<image class="editicon" src="https://ceres.zkthink.com/static/images/collectionEditicon.png"></image>
 					<text class="mar-left-10">编辑</text>
 				</view>
 				<view class="swipe-box">
@@ -77,8 +77,8 @@
 							<view class="wid" style="border-radius: 50%;">
 								<view class="flex-items-plus flex-row wid">
 									<view v-show="allCheckShow">
-										<image mode="aspectFill" v-if="item.selected == 1" @click.stop="answerItemSel(index,0)" src="../../static/images/selectActive.png" class="cart-select-img"></image>
-										<image mode="aspectFill" v-else @click.stop="answerItemSel(index,1)" src="../../static/images/selectEmpty.png" class="cart-select-img"></image>
+										<image mode="aspectFill" v-if="item.selected == 1" @click.stop="answerItemSel(index,0)" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img"></image>
+										<image mode="aspectFill" v-else @click.stop="answerItemSel(index,1)" src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img"></image>
 									</view>
 <!--									<image class="product-img" mode="aspectFill" :src="item.image" />-->
 									<view class="title-wrap replynum-box wid">
@@ -94,7 +94,7 @@
                       </view>
                       <view class="qAarrow mar-top-30 flex-items">
                         <text class="fs24 font-color-C5AA7B">共{{item.count}}个回答</text>
-                        <image class="item-btn-right" src="../../static/img/user/arrow.png" mode="widthFix"></image>
+                        <image class="item-btn-right" src="https://ceres.zkthink.com/static/img/user/arrow.png" mode="widthFix"></image>
                       </view>
 										</view>
 									</view>
@@ -106,8 +106,8 @@
 				</view>
 				<view v-show="allCheckShow" class="allcheck-box flex-row-plus flex-sp-between flex-items">
 					<view class="left">
-						<image mode="aspectFill" v-if="isAllAnswerCheck" src="../../static/images/selectActive.png" class="cart-select-img" @click="allAnswerSel(0)"></image>
-						<image mode="aspectFill" v-else src="../../static/images/selectEmpty.png" class="cart-select-img" @click="allAnswerSel(1)"></image>
+						<image mode="aspectFill" v-if="isAllAnswerCheck" src="https://ceres.zkthink.com/static/images/selectActive.png" class="cart-select-img" @click="allAnswerSel(0)"></image>
+						<image mode="aspectFill" v-else src="https://ceres.zkthink.com/static/images/selectEmpty.png" class="cart-select-img" @click="allAnswerSel(1)"></image>
 						<text>全选</text>
 					</view>
 					<view class="right">
@@ -117,7 +117,7 @@
 				<view v-if="allCheckShow" class="pad-bot-140"></view>
 			</view>
 			<view v-if="ifEmpty" class="mar-top-60 empty-box">
-				<image class="question-empty" src="../../static/img/bgnull.png"></image>
+				<image class="question-empty" src="https://ceres.zkthink.com/static/img/bgnull.png"></image>
 				<view class="tohome-box flex-items-plus">暂无问答内容</view>
 			</view>
 		</view>
@@ -130,7 +130,7 @@
 				</view>
 			</view>
 			<view class="cancel-but" @click="cancelClick">
-				<image src="../../static/images/cancelClose.png" mode=""></image>
+				<image src="https://ceres.zkthink.com/static/images/cancelClose.png" mode=""></image>
 			</view>
 		</u-popup> -->
 		<!-- 删除确认弹窗 -->
@@ -147,7 +147,7 @@
 				</view>
 			</view>
 			<view @click="cancelClick" class="cancelDel">
-				<image src="../../static/images/cancelClose.png" mode=""></image>
+				<image src="https://ceres.zkthink.com/static/images/cancelClose.png" mode=""></image>
 			</view>
 		</tui-modal>
 	</view>
@@ -700,7 +700,7 @@ page{background-color: #F7F7F7;}
     width: 60rpx;
     height: 60rpx;
     display: block;
-    background: url("../../static/images/delIcon.png") no-repeat center center;
+    background: url("https://ceres.zkthink.com/static/images/delIcon.png") no-repeat center center;
     background-size: contain;
   }
   .swipe-box /deep/ .u-swipe-action {

+ 3 - 3
pages_category_page2/userModule/register.vue

@@ -2,12 +2,12 @@
 <template>
 	<view class="container flex-items flex-column">
 		<view class="login-logoBox">
-			<image class="login-logo" src="../../static/images/loginLogo.png"></image>
+			<image class="login-logo" src="https://ceres.zkthink.com/static/images/loginLogo.png"></image>
 		</view>
 		<view>
 			<view class="iphoneNum-box flex-row-plus flex-items">
 				<view>
-          <image class="loginIcon" src="../../static/images/phone.png"></image>
+          <image class="loginIcon" src="https://ceres.zkthink.com/static/images/phone.png"></image>
 				</view>
 				<view style="margin-left: 40rpx;">
 					<input v-model="phone" class="iphoneNum-inputbox" placeholder-class="iphoneNum-input" type="number"
@@ -17,7 +17,7 @@
 			<view class="flex-row-plus mar-top-20">
 				<view class="code-box">
 					<view>
-            <image class="loginIcon" src="../../static/images/code.png"></image>
+            <image class="loginIcon" src="https://ceres.zkthink.com/static/images/code.png"></image>
 					</view>
 					<view style="margin-left: 40rpx;">
 						<input v-model="RegisterQuery.code" class="codeNum-inputbox" placeholder-class="codeNum-input"

+ 1 - 1
pages_category_page2/userModule/withdraw.vue

@@ -8,7 +8,7 @@
 				<view class="fs28 addressTag">银行卡</view>
 				<view>
 					<label v-model="cardNum">{{cardNum}}</label>
-					<image class="arrow mar-left-20" src="../../static/img/user/arrow.png"></image>
+					<image class="arrow mar-left-20" src="https://ceres.zkthink.com/static/img/user/arrow.png"></image>
 				</view>
 			</view>
 			<view class="apply-box">

BIN
static/assets/img/logo.png


BIN
static/assets/img/xian.png


BIN
static/images/accountBg.png


BIN
static/images/addBankBg.png


BIN
static/images/addCommentsIcon.png


BIN
static/images/addEdit.png


BIN
static/images/addImg.png


BIN
static/images/addImgBtn.png


BIN
static/images/addPraiseIcon.png


BIN
static/images/afterSaleClose.png


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.