首页广告弹窗修改

点击立即购买跳转订单确认页面时，点击切换地址，组合价不能同步问题处理
文案修改
hidden.js中str为空返回
售后详情，已原路退回金额条件修改
商品列表排序修改

components/adWindow.vue

@@ -112,6 +112,7 @@ export default {
     },
     // 获取广告信息
     getAd() {
+			console.log(this.triggerCondition,'triggerCondition000000')
       const res = uni.getStorageSync('storage_key'),
           token = res.token;
       setTimeout(() => {
@@ -119,7 +120,7 @@ export default {
         this.isLogin = !!token
         console.log(this.buyerUserId,this.isLogin,this.triggerCondition)
         NET.request(API.GetAd, {
-          triggerCondition: 2
+          triggerCondition: this.triggerCondition
         }, 'POST').then(res => {
           console.log('123131321323', res)
           if (res.data) {

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "cereshop",
-    "appid" : "__UNI__ECAA86F",
+    "appid" : "__UNI__B04DFAC",
     "description" : "cereshop",
     "versionName" : "1.7.2",
     "versionCode" : 172,
@@ -121,7 +121,6 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        /* 小程序特有相关 */
         "appid" : "wxf0713a10bbae8732",
         "setting" : {
             "urlCheck" : false,

pages_category_page1/goodsModule/goodsList.vue

@@ -140,23 +140,26 @@
         //   this.volume = this.volume != 1 ? 1:2
         //   this.sortIndex = index
         // }
-		if(index === 1){
-			this.type = 0
-			this.volume = 0
-		}else if(index === 2){
-			this.volume = 0
-			if(this.type === 0){
-				this.type = 1
-			}else{
-				this.type = this.type = 1 ? 2 : 1
-			}
-		}else if (index === 3){
-			this.type = 0
-			if(this.volume === 0){
-				this.volume = 1
-			}else{
-				this.volume = this.volume = 1 ? 2 : 1
-			}
+				console.log(index,'index')
+			if(index === 1){
+				this.type = 0
+				this.volume = 0
+			}else if(index === 2){
+				this.volume = 0
+				if(this.type === 0){
+					this.type = 1
+				}else{
+					console.log(this.type,'this.type1')
+					this.type = this.type != 1 ? 1 : 2
+				}
+				console.log(this.type,'this.type2')
+			}else if (index === 3){
+				this.type = 0
+				if(this.volume === 0){
+					this.volume = 1
+				}else{
+					this.volume = this.volume != 1 ? 1 : 2
+				}
 		}
 		this.sortIndex = index
         this.searchList()

pages_category_page1/orderModule/index.vue

@@ -73,7 +73,7 @@
                       </view>
                       <view v-if="proItem.commentId != 0 && item.state == 4 && item.skus[0].ifAdd !== 1"
                             class="evaluate2"
-                            @click.stop="evaluateTowTap(index,proItem.commentId)">追加评价{{item.skus[0].ifAdd}}
+                            @click.stop="evaluateTowTap(index,proItem.commentId)">追加评价
                       </view>
                     </view>
                   </view>

pages_category_page1/orderModule/orderConfirm.vue

@@ -59,7 +59,7 @@
                   </view>
                 </view>
               </view>
-							<view v-if="isRegionalScope" class="adressTips">当前地址不支持配送，可更换其他地址试试</view>
+							<view v-if="item.receiveNotMatch" class="adressTips">当前地址不支持配送，可更换其他地址试试</view>
               <view class="delivery-way-box">
                 <view>
                   <view class="item">
@@ -472,6 +472,7 @@ export default {
   },
   onLoad(options) {
     this.getQuery()
+		console.log(options,'options')
     this.type = options.type
     if (options.receiveId) {
       this.receiveId = options.receiveId
@@ -484,7 +485,7 @@ export default {
     }
     if (uni.getStorageSync("skuItemDTOList") != "") {
       this.skuItemDTOList = uni.getStorageSync('skuItemDTOList')
-      //console.log(this.skuItemDTOList, 66666)
+      console.log(this.skuItemDTOList, '66666')
       if (this.skuItemDTOList[0].shopDiscountId > 0) {
         this.sumitType = 4
       } else if (this.skuItemDTOList[0].shopSeckillId > 0) {
@@ -564,6 +565,8 @@ export default {
           shops: this.skuItemDTOList,
           receiveId: this.receiveId
         }
+				// composeId: 68
+				console.log(this.skuItemDTOList,'this.skuItemDTOList')
       }
       NET.request(_url, _data, 'POST').then(res => {
         uni.hideLoading()
@@ -649,8 +652,9 @@ export default {
 		},
 		
     addAddressTap() {
+			console.log(this.type, 'this.type')
       uni.navigateTo({
-        url: '../../pages_category_page2/userModule/address?type=1',
+        url: '../../pages_category_page2/userModule/address?type='+ this.type,
       })
     },
     getDate(time) {

pages_category_page2/orderModule/returnDetails.vue

@@ -141,9 +141,9 @@
 				</view>
 			</view>
 			<!-- 退款成功 -->
-			<view class="order-details-info-box mt20" v-if="status == 6">
+			<view class="order-details-info-box mt20" v-if="itemlist.afterState != 6 && status == 6">
 				<view class="order-details-price return-explain-box">
-					<text>已原路退回金额</text>
+					<text>已原路退回金额 {{itemlist.afterState}}</text>
 					<text class="price-box"><text class="fuhao">￥</text>{{itemlist.price}}</text>
 				</view>
 			</view>

pages_category_page2/userModule/address.vue

@@ -86,9 +86,10 @@
 		},
 		methods: {
 			back() {
-				if (this.type == 1) {
+				console.log(this.type,'type')
+				if (this.type == 1 || this.type == 2 ) {
 					uni.navigateTo({
-						url: '../../pages_category_page1/orderModule/orderConfirm?type=3'
+						url: '../../pages_category_page1/orderModule/orderConfirm?type=' + this.type
 					})
 				} else {
 					uni.switchTab({
@@ -97,7 +98,7 @@
 				}
 			},
 			addAddressClick() {
-				if (this.type == 1) {
+				if (this.type ==  1 || this.type == 2) {
 					uni.navigateTo({
 						url: 'addAddress?type=1&ordertype=1'
 					})
@@ -144,11 +145,11 @@
 				})
 			},
 			itemTap(item) {
-				if (this.type == 1) {
+				if (this.type == 1 ||  this.type == 2) {
 					uni.setStorageSync('receiveItem', item)
 					uni.navigateTo({
-						url: '../../pages_category_page1/orderModule/orderConfirm?type=3&receiveId=' + item
-							.receiveId
+						url: '../../pages_category_page1/orderModule/orderConfirm?receiveId=' + item
+							.receiveId +'&type='+ this.type
 					})
 				}
 			},

utils/hidden.js

@@ -1,8 +1,8 @@
 // 中间部分
 export function hidden (str, frontLen, endLen) {
   let endLenData = 0
-	if(!str.length){
-		return
+	if(!str.length || !str){
+		return ''
 	}
   if (str.length !== 2) {
     endLenData = endLen