sss
重庆迈尖科技有限公司
2020-06-17 1166643c4385aa3267c22b979e6c13023e5ead27
sss
5个文件已修改
248 ■■■■ 已修改文件
AppInside/activityDetailTempPage/index.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/cloudPushOrder/cloudPushOrderManage.html 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/cloudPushOrder/css/base.css 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/cloudPushOrder/openCloudPushOrder.html 81 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/cloudPushOrder/openRecord.html 81 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/activityDetailTempPage/index.html
@@ -485,9 +485,10 @@
                                    click: function() { //点击事件
                                        app.openScroll();
                                        $('.imgshow').css('display', 'none');
                                        // $('.imgshow .swiper-wrapper').empty();
                                        var container = $('.imgshow');
                                        $(container).scrollTop(0);
                                        // $('.imgshow .swiper-wrapper').empty();
                                        ('.imgshow').scrollTop = 0;
                                        this.destroy(false);
                                        setTimeout(function() {
                                            isShowImg = false;
AppInside/cloudPushOrder/cloudPushOrderManage.html
@@ -216,7 +216,7 @@
                </div>
                <div class="div_goodsLibraryList">
                    <div class="div_item_goodsLibrary" v-for="(item, index) in goodsList">
                    <div class="div_item_goodsLibrary" v-for="(item, index) in goodsList" @click="goodsDetail(item)">
                        <img src="img/icon_goodsDelete.png" class="goodsDeleteImg" @click="deleteListGoods(index, item.id)">
                        <div class="div_goodsBG">
@@ -252,22 +252,25 @@
                            </div>
                            <div class="div_coupon_bg">
                                <div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" style="color: white;font-size: 0.24rem;font-weight: bold;width: 0.41rem;height: 0.36rem;background-color: #E5005C;display: flex;align-items: center;justify-content: center;border-radius: 0.06rem 0 0 0.06rem;">
                                <div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" style="color: white;font-size: 0.24rem;font-weight: bold;width: 0.41rem;height: 0.36rem;background-color: #E5005C;border-radius: 0.06rem 0 0 0.06rem;text-align: center;">
                                    券
                                </div>
                                <div v-else-if="item.goods.shopType==40" style="color: white;font-size: 0.24rem;background-color: #E5005C;border-radius: 0.06rem;">
                                <div v-else-if="item.goods.shopType==40" style="color: white;font-size: 0.24rem;background-color: #E5005C;border-radius: 0.06rem;line-height: 0.36rem;">
                                    &nbsp;&nbsp;{{item.goods.discount}}&nbsp;&nbsp;
                                </div>
                                <div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" class="coupon_money">&nbsp;¥{{item.goods.couponInfo.amount}}
                                    &nbsp;</div>
                                <div class="fanli_title">&nbsp;&nbsp; 返 {{item.goods.moneyInfo.fanliMoney}} &nbsp;&nbsp;&nbsp;</div>
                                <div v-if="item.goods.hasCoupon||item.goods.shopType==40" class="fanli_title">&nbsp;&nbsp; 返
                                    {{item.goods.moneyInfo.fanliMoney}} &nbsp;&nbsp;&nbsp;</div>
                                <div v-else class="fanli_title" style="margin-left: 0rem;">&nbsp;&nbsp; 返 {{item.goods.moneyInfo.fanliMoney}}
                                    &nbsp;&nbsp;&nbsp;</div>
                                <img src="img/icon_maxFan.png" style="width: 0.10rem;height: 0.17rem; margin-left: -0.22rem;">
                                <img src="img/icon_maxFan.png" style="width: 0.15rem;height: 0.22rem; margin-left: -0.22rem;">
                                <div v-if="item.goods.moneyInfo.maxMoney" style="color: #E5005C;font-size: 0.24rem;margin-left: -0.05rem; height: 0.36rem; background-color: #FFBBCB;border-radius: 0.06rem;display: -webkit-flex;align-items: center;justify-content: center;">
                                    &nbsp;&nbsp; {{item.goods.moneyInfo.maxMoney}} &nbsp;&nbsp;
                                <div v-if="item.goods.moneyInfo.maxMoney" style="color: #E5005C;font-size: 0.24rem;margin-left: -0.05rem; height: 0.36rem; background-color: #FFBBCB;border-radius: 0 0.06rem 0.06rem 0;display: -webkit-flex;align-items: center;justify-content: center;">
                                    &nbsp; {{item.goods.moneyInfo.maxMoney}} &nbsp;
                                </div>
                            </div>
@@ -863,6 +866,46 @@
                        });
                    },
                    goodsDetail: function(goods) {
                        var activity = null;
                        var controller = null;
                        var goodsType = goods.goods.goodsType;
                        var goodsId = goods.goods.goodsId;
                        var fromString = '云发单';
                        if (goods.goods.goodsType == 1) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivityTB';
                            controller = 'GoodDeTrViewController';
                        } else if (goods.goods.goodsType == 2) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivityJD';
                            controller = 'JDGoodsDetailController';
                        } else if (goods.goods.goodsType == 3) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivityPDD';
                            controller = 'PDDGoodsDetailController';
                        } else if (goods.goods.goodsType == 4) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivityVIP';
                            controller = 'WPHGoodsDetailController';
                        } else if (goods.goods.goodsType == 5) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivitySuning';
                            controller = 'SNGoodsDetailController';
                        }
                        var jumpDetail = {
                            activity: activity,
                            controller: controller
                        }
                        var params = {
                            goodsType: goodsType,
                            id: goodsId,
                            from: fromString
                        }
                        yesApp.jumpPage(jumpDetail, params);
                    },
                    // 删除商品
                    deleteListGoods: function(indexpath, deleteId) {
                        yesApp.showLoading();
AppInside/cloudPushOrder/css/base.css
@@ -160,7 +160,7 @@
.goodsimg {
    width: 2.6rem;
    height: 2.6rem;
    background-color: #F6F6F6;
    background-color: #F5F5F5;
    border-radius: 0.1rem;
    margin-top: 0.16rem;
    margin-left: 0.16rem;
@@ -253,32 +253,32 @@
    position: absolute;
    display: flex;
    bottom: 0.17rem;
    align-items: center;
    align-items: center;
    /* height: 0.36rem; */
}
.coupon_money {
    color: #E5005C;
    font-size: 0.24rem;
    border-right: 1px solid #E5005C;
    border-top: 1px solid #E5005C;
    border-bottom: 1px solid #E5005C;
    border-right: 0.02rem solid #E5005C;
    border-top: 0.02rem solid #E5005C;
    border-bottom: 0.02rem solid #E5005C;
    height: 0.32rem;
    display: flex;
    align-items: center;
    justify-content: center;
    border-radius: 0 0.06rem 0.06rem 0;
    border-radius: 0 0.06rem 0.06rem 0;
    line-height: 0.33rem;
}
.fanli_title {
    color: #E5005C;
    font-size: 0.24rem;
    height: 0.36rem;
    display: flex;
    display: -webkit-flex;
    align-items: center;
    justify-content: center;
    background-color: #FFE7F1;
    border-radius: 0.06rem;
    margin-left: 0.16rem;
    margin-left: 0.16rem;
    line-height: 0.2rem;
}
.div_payment_sales_bg {
AppInside/cloudPushOrder/openCloudPushOrder.html
@@ -182,7 +182,7 @@
                </div>
                <div class="div_goodsLibraryList">
                    <div class="div_item_goodsLibrary" v-for="(item, index) in goodsList">
                    <div class="div_item_goodsLibrary" v-for="(item, index) in goodsList" @click="goodsDetail(item)">
                        <img src="img/icon_goodsDelete.png" class="goodsDeleteImg" @click="deleteListGoods(index, item.id)">
                        <div class="div_goodsBG">
@@ -217,24 +217,27 @@
                                <div v-if="item.goods.shopInfo">{{item.goods.shopInfo.shopName}}</div>
                            </div>
                            <div class="div_coupon_bg">
                                <div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" style="color: white;font-size: 0.24rem;font-weight: bold;width: 0.41rem;height: 0.36rem;background-color: #E5005C;display: flex;align-items: center;justify-content: center;border-radius: 0.06rem 0 0 0.06rem;">
                                    券
                                </div>
                                <div v-else-if="item.goods.shopType==40" style="color: white;font-size: 0.24rem;background-color: #E5005C;border-radius: 0.06rem;">
                                    &nbsp;&nbsp;{{item.goods.discount}}&nbsp;&nbsp;
                                </div>
                                <div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" class="coupon_money">&nbsp;¥{{item.goods.couponInfo.amount}}
                                    &nbsp;</div>
                                <div class="fanli_title">&nbsp;&nbsp; 返{{item.goods.moneyInfo.fanliMoney}} &nbsp;&nbsp;&nbsp;</div>
                                <img src="img/icon_maxFan.png" style="width: 0.10rem;height: 0.17rem; margin-left: -0.22rem;">
                                <div v-if="item.goods.moneyInfo.maxMoney" style="color: #E5005C;font-size: 0.24rem;margin-left: -0.05rem; height: 0.36rem; background-color: #FFBBCB;border-radius: 0.06rem;display: -webkit-flex;align-items: center;justify-content: center;">
                                    &nbsp;&nbsp; {{item.goods.moneyInfo.maxMoney}} &nbsp;&nbsp;
                                </div>
                            <div class="div_coupon_bg">
                                <div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" style="color: white;font-size: 0.24rem;font-weight: bold;width: 0.41rem;height: 0.36rem;background-color: #E5005C;border-radius: 0.06rem 0 0 0.06rem;text-align: center;">
                                    券
                                </div>
                                <div v-else-if="item.goods.shopType==40" style="color: white;font-size: 0.24rem;background-color: #E5005C;border-radius: 0.06rem;line-height: 0.36rem;">
                                    &nbsp;&nbsp;{{item.goods.discount}}&nbsp;&nbsp;
                                </div>
                                <div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" class="coupon_money">&nbsp;¥{{item.goods.couponInfo.amount}}
                                    &nbsp;</div>
                                <div v-if="item.goods.hasCoupon||item.goods.shopType==40" class="fanli_title">&nbsp;&nbsp; 返
                                    {{item.goods.moneyInfo.fanliMoney}} &nbsp;&nbsp;&nbsp;</div>
                                <div v-else class="fanli_title" style="margin-left: 0rem;">&nbsp;&nbsp; 返 {{item.goods.moneyInfo.fanliMoney}}
                                    &nbsp;&nbsp;&nbsp;</div>
                                <img src="img/icon_maxFan.png" style="width: 0.15rem;height: 0.22rem; margin-left: -0.22rem;">
                                <div v-if="item.goods.moneyInfo.maxMoney" style="color: #E5005C;font-size: 0.24rem;margin-left: -0.05rem; height: 0.36rem; background-color: #FFBBCB;border-radius: 0 0.06rem 0.06rem 0;display: -webkit-flex;align-items: center;justify-content: center;">
                                    &nbsp; {{item.goods.moneyInfo.maxMoney}} &nbsp;
                                </div>
                            </div>
                            <div class="div_payment_sales_bg">
@@ -562,6 +565,46 @@
                        });
                    },
                    goodsDetail: function(goods) {
                        var activity = null;
                        var controller = null;
                        var goodsType = goods.goods.goodsType;
                        var goodsId = goods.goods.goodsId;
                        var fromString = '云发单';
                        if (goods.goods.goodsType == 1) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivityTB';
                            controller = 'GoodDeTrViewController';
                        } else if (goods.goods.goodsType == 2) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivityJD';
                            controller = 'JDGoodsDetailController';
                        } else if (goods.goods.goodsType == 3) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivityPDD';
                            controller = 'PDDGoodsDetailController';
                        } else if (goods.goods.goodsType == 4) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivityVIP';
                            controller = 'WPHGoodsDetailController';
                        } else if (goods.goods.goodsType == 5) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivitySuning';
                            controller = 'SNGoodsDetailController';
                        }
                        var jumpDetail = {
                            activity: activity,
                            controller: controller
                        }
                        var params = {
                            goodsType: goodsType,
                            id: goodsId,
                            from: fromString
                        }
                        yesApp.jumpPage(jumpDetail, params);
                    },
                    // 删除商品
                    deleteListGoods: function(indexpath, deleteId) {
                        yesApp.showLoading();
AppInside/cloudPushOrder/openRecord.html
@@ -100,7 +100,7 @@
                </div>
                <div class="div_goodsLibraryList">
                    <div class="div_item_goodsLibrary" v-for="(item, index) in goodsList">
                    <div class="div_item_goodsLibrary" v-for="(item, index) in goodsList" @click="goodsDetail(item)">
                        <img src="img/icon_goodsDelete.png" class="goodsDeleteImg" @click="deleteListGoods(index, item.id)">
                        <div class="div_goodsBG">
@@ -135,24 +135,27 @@
                                <div v-if="item.goods.shopInfo">{{item.goods.shopInfo.shopName}}</div>
                            </div>
                            <div class="div_coupon_bg">
                                <div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" style="color: white;font-size: 0.24rem;font-weight: bold;width: 0.41rem;height: 0.36rem;background-color: #E5005C;display: flex;align-items: center;justify-content: center;border-radius: 0.06rem 0 0 0.06rem;">
                                    券
                                </div>
                                <div v-else-if="item.goods.shopType==40" style="color: white;font-size: 0.24rem;background-color: #E5005C;border-radius: 0.06rem;">
                                    &nbsp;&nbsp;{{item.goods.discount}}&nbsp;&nbsp;
                                </div>
                                <div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" class="coupon_money">&nbsp;¥{{item.goods.couponInfo.amount}}
                                    &nbsp;</div>
                                <div class="fanli_title">&nbsp;&nbsp; 返{{item.goods.moneyInfo.fanliMoney}} &nbsp;&nbsp;&nbsp;</div>
                                <img src="img/icon_maxFan.png" style="width: 0.10rem;height: 0.17rem; margin-left: -0.22rem;">
                                <div v-if="item.goods.moneyInfo.maxMoney" style="color: #E5005C;font-size: 0.24rem;margin-left: -0.05rem; height: 0.36rem; background-color: #FFBBCB;border-radius: 0.06rem;display: -webkit-flex;align-items: center;justify-content: center;">
                                    &nbsp;&nbsp; {{item.goods.moneyInfo.maxMoney}} &nbsp;&nbsp;
                                </div>
                            <div class="div_coupon_bg">
                                <div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" style="color: white;font-size: 0.24rem;font-weight: bold;width: 0.41rem;height: 0.36rem;background-color: #E5005C;border-radius: 0.06rem 0 0 0.06rem;text-align: center;">
                                    券
                                </div>
                                <div v-else-if="item.goods.shopType==40" style="color: white;font-size: 0.24rem;background-color: #E5005C;border-radius: 0.06rem;line-height: 0.36rem;">
                                    &nbsp;&nbsp;{{item.goods.discount}}&nbsp;&nbsp;
                                </div>
                                <div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" class="coupon_money">&nbsp;¥{{item.goods.couponInfo.amount}}
                                    &nbsp;</div>
                                <div v-if="item.goods.hasCoupon||item.goods.shopType==40" class="fanli_title">&nbsp;&nbsp; 返
                                    {{item.goods.moneyInfo.fanliMoney}} &nbsp;&nbsp;&nbsp;</div>
                                <div v-else class="fanli_title" style="margin-left: 0rem;">&nbsp;&nbsp; 返 {{item.goods.moneyInfo.fanliMoney}}
                                    &nbsp;&nbsp;&nbsp;</div>
                                <img src="img/icon_maxFan.png" style="width: 0.15rem;height: 0.22rem; margin-left: -0.22rem;">
                                <div v-if="item.goods.moneyInfo.maxMoney" style="color: #E5005C;font-size: 0.24rem;margin-left: -0.05rem; height: 0.36rem; background-color: #FFBBCB;border-radius: 0 0.06rem 0.06rem 0;display: -webkit-flex;align-items: center;justify-content: center;">
                                    &nbsp; {{item.goods.moneyInfo.maxMoney}} &nbsp;
                                </div>
                            </div>
                            <div class="div_payment_sales_bg">
@@ -458,6 +461,46 @@
                        });
                    },
                    goodsDetail: function(goods) {
                        var activity = null;
                        var controller = null;
                        var goodsType = goods.goods.goodsType;
                        var goodsId = goods.goods.goodsId;
                        var fromString = '云发单';
                        if (goods.goods.goodsType == 1) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivityTB';
                            controller = 'GoodDeTrViewController';
                        } else if (goods.goods.goodsType == 2) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivityJD';
                            controller = 'JDGoodsDetailController';
                        } else if (goods.goods.goodsType == 3) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivityPDD';
                            controller = 'PDDGoodsDetailController';
                        } else if (goods.goods.goodsType == 4) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivityVIP';
                            controller = 'WPHGoodsDetailController';
                        } else if (goods.goods.goodsType == 5) {
                            activity = 'com.yeshi.ec.rebate.myapplication.ui.recommend.GoodsDetailActivitySuning';
                            controller = 'SNGoodsDetailController';
                        }
                        var jumpDetail = {
                            activity: activity,
                            controller: controller
                        }
                        var params = {
                            goodsType: goodsType,
                            id: goodsId,
                            from: fromString
                        }
                        yesApp.jumpPage(jumpDetail, params);
                    },
                    // 删除商品
                    deleteListGoods: function(indexpath, deleteId) {
                        yesApp.showLoading();