diff --git a/components/diy_public/diy_public.js b/components/diy_public/diy_public.js
new file mode 100644
index 0000000..ce4cdce
--- /dev/null
+++ b/components/diy_public/diy_public.js
@@ -0,0 +1,420 @@
+// var e = function(e) {
+// return e && e.__esModule ? e : {
+// default: e
+// };
+// }(require("../../utils/LoadMore3.js")),
+// n = new e.default(),
+var t = getApp(),
+ a = t.request,
+ o = t.globalData.setting,
+ os = o,
+ i = require("../../utils/util.js"),
+ ut = i,
+ s = require("../../utils/common.js");
+var regeneratorRuntime = require('../../utils/runtime.js');
+Component({
+ properties: {
+ // 这里定义了innerText属性，属性值可以在组件使用时指定
+ object: {
+ type: Object,
+ value: null,
+ },
+ goods_array: {
+ type: Array,
+ value: []
+ },
+ newTime: {
+ type: Number,
+ value: 0
+ },
+ prom_type:{
+ type:Number,
+ value:0
+ }
+ },
+ data: {
+ // 这里是一些组件内部数据
+ yc: false,
+ someData: null,
+ ylp_img: "https://mshopimg.yolipai.net/",
+ imghost: os.imghost,
+ timer: null,
+ user_id:0,
+ img_width:100,
+ img_height:100,
+ swiperHeight:0,
+ prom_text:"已秒",
+ kttypeArr:['','商家','会员','阶梯'],
+ imgobj:{
+ '1':"/miniapp/images/component/seckill.png",
+ '6':"/miniapp/images/component/pingd/pingd.png"
+ },
+ nav1:'/packageA/pages/goodsInfo/goodsInfo?',
+ nav2:'/pages/goods/goodsInfo/goodsInfo?',
+ },
+
+ pageLifetimes: {
+ //要处理一下，游客登录后的界面的变化,主要还该是改变会员
+ show: function () {
+
+
+ //会员身份变化
+ var th = this;
+ var g_id = this.data.object;
+
+ //只有再会员登陆之后，才重新调用接口
+ // console.log('秒杀组件------------');
+ // if(this.data.user_id!=getApp().globalData.user_id){
+ // this.data.user_id=getApp().globalData.user_id
+ // this.init(g_id);
+ // }
+ setTimeout(function () {
+ if (th.data.goods_array && th.data.goods_array.length > 0) {
+ th.data.timer = setInterval(function () {
+ th.countDown2(th);
+ }, 1000);
+ }
+ },600)
+ },
+
+ hide:function () {
+ // 页面被被销毁的时候，清除定时器
+ clearInterval(this.data.timer);
+ }
+ },
+
+ ready: function () {
+ if (this.data.prom_type==6) {
+ this.setData({
+ prom_text:'已团',
+ nav1:'/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?',
+ nav2:'/pages/goods/goodsInfo/goodsInfo?'
+ })
+ }
+ var g_id = this.data.object;
+
+ this.init(g_id);
+ this.data.user_id=getApp().globalData.user_id;
+ },
+ detached() {
+ // 页面被被销毁的时候，清除定时器
+ clearInterval(this.data.timer);
+ },
+ methods: {
+ // 这里是一个自定义方法
+ customMethod: function () { },
+ init: function (g_id) {
+ var th = this;
+ this.loadImg(g_id)
+ getApp().getConfig2(function (e) {
+ var swithc_list = e.switch_list;
+ var sw_arr = JSON.parse(swithc_list);
+
+ if(sw_arr.is_retail_price){
+ th.setData({is_retail_price:1});
+ }
+ })
+
+
+ var app = getApp(), goodsidlist = "", idlist = "";
+ if (g_id.data_type == 2) {
+ if (g_id.data && g_id.data.length > 0) {
+ //--先把商品ID串起来--
+ g_id.data.forEach(function (val, ind) {
+ var item = {};
+ goodsidlist += val.goodsid + ",";
+ idlist += val.flashid + ",";
+ })
+ goodsidlist = ut.sub_last(goodsidlist);
+ idlist = ut.sub_last(idlist);
+
+ var user_id=getApp().globalData.user_id;
+ if(!user_id){ user_id=0;}
+
+ //--调用接口,读取秒杀--
+ // var gUrl = "/api/ms/flash_sale/getGoodsList?store_id=" + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id="+user_id+"&type=1";
+ let gUrl = "/api/ms/flash_sale/getGoodsList?store_id=" + os.stoid + "&idlist=" + idlist + "&user_id="+user_id+"&type=1";
+
+ if (th.data.prom_type==6) { //天天拼单
+ gUrl="/api/weshop/teamlist/getGoodsList?store_id="
+ +os.stoid+"&goodsidlist="+goodsidlist;
+ }
+
+
+ app.request.promiseGet(gUrl, {}).then(res => {
+
+ //如果秒杀的数组为空的时候
+ var goodslist = res.data.data;
+ //就算是添加的活动已经过期，就要用最新的进行中活动
+ if (goodslist && goodslist.length > 0) {
+ th.set_goods_list(g_id.data, goodslist);
+ }
+ });
+ }
+ } else {
+ th.no_gid_set();
+ }
+ },
+
+ //当是默认的情况
+ no_gid_set() {
+ var user_id=getApp().globalData.user_id;
+ if(!user_id){ user_id=0;}
+
+ let req={ store_id: os.stoid, is_end: 0, is_show: 1, timetype: 2,user_id:user_id};
+ let gUrl="/api/ms/flash_sale/spikepage?page=1&pageSize=9"
+
+ if (this.data.prom_type==6) { //天天拼单
+ gUrl="/api/weshop/teamlist/pageteam/2?page=1&pageSize=9"
+ req={
+ store_id:os.stoid,
+ is_end: 0,
+ is_show: 1,
+ user_id:user_id,
+ }
+ }
+
+ getApp().request.promiseGet(gUrl,
+ { isShowLoading: 1, data:req }
+ ).then(res => {
+
+ if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
+ var goodsidlist = res.data.data.pageData;
+ this.set_goods_list(null, goodsidlist);
+ }
+ });
+ },
+
+ //就算是添加的活动已经过期，就要用最新的活动
+ set_goods_list(g_id, goodslist) {
+ let prom_type=this.data.prom_type
+ goodslist.forEach(function (vy, indy) {
+ if(!vy.id) vy.id=vy.prom_id;
+ })
+
+ // 判断火热，预热
+ var newTime = ut.gettimestamp(), all_array = [], th = this;
+ th.setData({ newTime: newTime });
+ if (g_id) {
+ /*--商品队列按照添加的顺序排列--*/
+ g_id.forEach(function (val, ind) {
+ goodslist.forEach(function (vy, indy) {
+ if (val.goodsid == vy.goods_id) {
+ all_array.push(vy);
+ }
+ })
+ })
+ } else {
+ all_array = goodslist;
+ }
+
+ if (all_array.length == 0) {
+ all_array = goodslist;
+ }
+
+ for(let i in all_array){
+ let item=all_array[i];
+ if(item.user_price) item.price=item.user_price;
+ if(item.start_time > newTime) {
+ item.status = 0;
+ } else if(item.end_time > newTime) {
+ item.status = 1;
+ };
+
+ }
+
+
+ var promisies = [];
+ for (const key in all_array) {
+ if (Object.hasOwnProperty.call(all_array, key)) {
+ const val = all_array[key];
+
+ promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+ os.stoid + "/"+prom_type+"/" + val.id,
+ {}
+ ).then(res => {
+ if (res.data.code == 0) {
+ if (res.data.data <= 0) all_array[key].status = 2;
+ };
+ });
+ }
+ }
+
+
+ Promise.all(promisies).then(() => {
+ // 判断活动是否结束
+ let empty=[]
+ for(let i in all_array){
+ let item=all_array[i];
+ if(newTime > item.end_time) {
+ all_array[i].status = 3;
+ };
+ // let price=all_array[i].price.toFixed(2)
+ let price=all_array[i].price + ''
+ if (price && price.indexOf('.') > -1) {
+ let priceArr = price.split(".")
+ all_array[i].price_n = priceArr[0]
+ all_array[i].price_xs = priceArr[1]
+ }else{
+ all_array[i].price_n = price
+ }
+
+ all_array[i].residue=all_array[i].goods_num*1 - all_array[i].buy_num*1
+ if (all_array[i].residue && all_array[i].residue > 0 && all_array[i].status !=2) {
+ empty.push(all_array[i])
+ }
+ }
+
+ //控制已售罄是否显示
+ if (!th.data.object.hide_sold_out_items) {
+ all_array=empty
+ }
+
+
+ var arr = new Array();
+ if (th.data.object.style==7) {
+ //--三个三个一组---
+ for (var i = 0; i < all_array.length; i += 2) {
+ arr.push(all_array.slice(i, i + 2));
+ }
+ }else{
+ //--三个三个一组---
+ for (var i = 0; i < all_array.length; i += 3) {
+ arr.push(all_array.slice(i, i + 3));
+ }
+ }
+
+
+ /*--熏染到前台--*/
+ th.setData({ goods_array: arr });
+ if (th.data.object.style==6) {
+ th.setSwiper_h()
+ }
+
+ });
+
+
+ th.data.timer = setInterval(function () {
+ th.countDown2(th);
+ }, 1000);
+ },
+ setSwiper_h(){
+ var th=this
+ wx.createSelectorQuery().in(this).select('.swiper_h').boundingClientRect(rect => {
+ if (rect && rect.height) {
+ var sumHeigth=(rect.height+13)+'px'
+ th.setData({
+ swiperHeight: sumHeigth
+ })
+ }
+ }).exec();
+ // const query = this.createSelectorQuery()
+ // query.select('.swiper_h').boundingClientRect()
+ // query.exec( (res)=> {
+ // console.log(res)
+ // console.log(res[0].height)
+ // console.log(res[0].height * data.t.length)
+ // let sumHeigth = res[0].height * data.t.length;
+ // console.error('组件高度');
+ // console.log(sumHeigth);
+ // th.setData({
+ // swiperHeight: sumHeigth
+ // })
+ // })
+ },
+
+
+ //---小于10的格式化函数----
+ timeFormat: function (param) {
+ return param < 10 ? '0' + param : param;
+ },
+ //----秒杀倒计时函数-----
+ countDown2: function (ob) {
+ if (ob == undefined) return false;
+ var ee = ob;
+ // 获取当前时间，同时得到活动结束时间数组
+ var newTime = ut.gettimestamp();
+ this.setData({ newTime: newTime });
+
+ var List = ee.data.goods_array;
+ if (List.length == 0) return false;
+ for (var j = 0; j < List.length; j++) {
+ // 对结束时间进行处理渲染到页面
+ var endTimeList = List[j];
+ for (var i = 0; i < endTimeList.length; i++) {
+ var o = endTimeList[i];
+ var endTime = o.end_time;
+ if (newTime < o.start_time) endTime = o.start_time;
+ let obj = null;
+ // 如果活动未结束，对时间进行处理
+ if (endTime - newTime > 0) {
+ let time = (endTime - newTime);
+ // 获取天、时、分、秒
+ let day = parseInt(time / (60 * 60 * 24));
+ let hou = parseInt(time % (60 * 60 * 24) / 3600);
+ let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+ let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
+ obj = {
+ day: this.timeFormat(day),
+ hou: this.timeFormat(hou),
+ min: this.timeFormat(min),
+ sec: this.timeFormat(sec)
+ }
+ } else {
+ //活动已结束，全部设置为'00'
+ obj = {
+ day: '00',
+ hou: '00',
+ min: '00',
+ sec: '00'
+ }
+ }
+ var txt = "goods_array[" + j + "][" + i + "].djs";
+ ee.setData({
+ [txt]: obj
+ });
+ }
+ }
+ },
+ //图片失败，默认图片
+ bind_bnerr3: function (e) {
+ var _errImg = e.target.dataset.errorimg;
+ var _errObj = {};
+ _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
+ this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ },
+
+ go_to: function () {
+ let url= "/pages/activity/seckill_list/seckill_list"
+ if (this.data.prom_type==6) { //天天拼单
+ url="/pages/activity/pind_list/pind_list"
+ }
+ wx.navigateTo({
+ url
+ });
+ },
+ //加入购物车
+ shoppingCart(){
+ console.log('加入购物车');
+ },
+ loadImg(g_id){
+ if (g_id.style==1) {
+ let w=''
+ switch (g_id.picture_scale) {
+ case 1:
+ w=`width:calc(100%-${g_id.page_margins*2}px);height:calc(100%-${g_id.page_margins*2}px)`
+ break;
+
+ default:
+ break;
+ }
+
+
+
+ }
+ }
+
+ },
+
+
+})
\ No newline at end of file
diff --git a/components/diy_public/diy_public.json b/components/diy_public/diy_public.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/components/diy_public/diy_public.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/diy_public/diy_public.wxml b/components/diy_public/diy_public.wxml
new file mode 100644
index 0000000..6dce2de
--- /dev/null
+++ b/components/diy_public/diy_public.wxml
@@ -0,0 +1,465 @@
+
+
+
+
+
+
+
+ {{object.column_name}}
+
+
+ 更多
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+
+
+ 距结束时间
+ 距开始时间
+ {{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}
+
+
+
+
+
+ {{aitem.goods_name}}
+
+ {{aitem.ct_num}}人团
+ {{kttypeArr[aitem.kttype]}}团
+
+
+
+
+ {{prom_text}}{{aitem.buy_num}}件
+ 还剩余{{aitem.status==2 ? '0' : aitem.residue}}件
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}
+ ￥{{aitem.shop_price || aitem.market_price}}
+
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+ {{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}
+
+
+
+ {{aitem.goods_name}}
+
+ {{aitem.ct_num}}人团
+ {{kttypeArr[aitem.kttype]}}团
+
+
+ {{prom_text}}{{aitem.buy_num}}件
+ 还剩余{{aitem.residue}}件
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}
+ ￥{{aitem.shop_price || aitem.market_price}}
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+ {{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}
+
+
+
+ {{aitem.goods_name}}
+
+ {{prom_text}}{{aitem.buy_num}}件
+ 剩{{aitem.residue}}件
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}
+ ￥{{aitem.shop_price || aitem.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+ {{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}
+
+
+
+
+ {{aitem.goods_name}}
+
+
+ {{prom_text}}{{aitem.buy_num}}件
+ 剩{{aitem.residue}}件
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}￥{{aitem.shop_price || aitem.market_price}}
+
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+
+
+ 距结束时间
+ 距开始时间
+ {{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}
+
+
+
+
+
+ {{aitem.goods_name}}
+
+ {{aitem.ct_num}}人团
+ {{kttypeArr[aitem.kttype]}}团
+
+
+
+
+ {{prom_text}}{{aitem.buy_num}}件
+ 还剩余{{aitem.status==2 ? '0' : aitem.residue}}件
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}
+ ￥{{aitem.shop_price || aitem.market_price}}
+
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+ {{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}
+
+
+
+ {{aitem.goods_name}}
+
+ {{aitem.ct_num}}人团
+ {{kttypeArr[aitem.kttype]}}团
+
+
+ {{prom_text}}{{aitem.buy_num}}件
+ 还剩余{{aitem.residue}}件
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}
+ ￥{{aitem.shop_price || aitem.market_price}}
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+ {{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}
+
+
+
+ {{aitem.goods_name}}
+
+ {{aitem.ct_num}}人团
+ {{kttypeArr[aitem.kttype]}}团
+
+
+ {{prom_text}}{{aitem.buy_num}}件
+ 还剩余{{aitem.residue}}件
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}
+ ￥{{aitem.shop_price || aitem.market_price}}
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}
+
+
+ {{aitem.goods_name}}
+
+ {{prom_text}}{{aitem.buy_num}}件
+ 还剩余{{aitem.residue}}件
+
+
+
+
+ ￥{{aitem.price}}
+ ￥{{aitem.shop_price || aitem.market_price}}
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+ {{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}
+
+
+
+ {{aitem.goods_name}}
+
+ {{prom_text}}{{aitem.buy_num}}件
+ 剩{{aitem.residue}}件
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}
+ ￥{{aitem.shop_price || aitem.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/diy_public/diy_public.wxss b/components/diy_public/diy_public.wxss
new file mode 100644
index 0000000..f8b56b0
--- /dev/null
+++ b/components/diy_public/diy_public.wxss
@@ -0,0 +1,547 @@
+.flex{
+ display: flex;
+ align-items: center;
+}
+.top {
+ background-color: white;
+ height: 70rpx;
+ line-height: 70rpx;
+ color: #000;
+ border-bottom: 2rpx solid #eee;
+ padding:0rpx 20rpx;
+ display: flex;
+ justify-content: space-between;
+ /* font-size: 32rpx; */
+ font-size: 24rpx;
+}
+
+.s_it {
+ width: 100%;
+ display: flex;
+ background-color: white;
+}
+
+.s_prom {
+ width: 100%;
+ background-color: white;
+ min-height: 200rpx;
+}
+
+swiper {
+ display: block;
+ height: 400rpx;
+}
+
+.right_k {
+ width: 93rpx;
+ color: #7b7b7b;
+}
+.right_k image{
+ width: 20rpx;
+ height: 20rpx;
+}
+ .t_left {
+ width: 10rpx;
+ height: 38rpx;
+ background: #f23030;
+ margin-right: 10rpx;
+}
+.n_t_ms{
+ color:#f23030;
+}
+
+.sp {
+ min-height: 300rpx;
+ width: 100%;
+ background-color: white;
+ padding: 18rpx;
+ display: flex;
+}
+
+.sp .sp_top {
+ height: 220rpx;
+ min-width: 30%;
+}
+
+.sp .sp_top .s_img {
+ width: 210rpx;
+ height: 100%;
+}
+
+.sp .sp_top .s_img image {
+ width: 210rpx;
+ height: 100%;
+ position: relative;
+ top: -74rpx;
+ left: 0rpx;
+}
+
+.sp .sp_top .s_top_kill {
+ background-color: #c4182e;
+ font-size: 24rpx;
+ height: 38rpx;
+ line-height: 38rpx;
+ padding: 4rpx 10rpx;
+ border-radius: 10rpx;
+ z-index: 999;
+ position: relative;
+ top: 1rpx;
+ width: 110rpx;
+ color: #fff;
+ text-align: center;
+}
+
+.po {
+ position: absolute;
+}
+
+.sp .sp_top .s_foot_kill {
+ font-size: 20rpx;
+ position: relative;
+ top: -90rpx;
+ width: 210rpx;
+ height: 38rpx;
+ line-height: 38rpx;
+ color: #fff;
+ text-align: center;
+ background-color: rgba(0, 0, 0, 0.5);
+}
+
+.sp_wz {
+ width: 210rpx;
+ min-height: 100rpx;
+}
+
+.sp_wz .sp_wzi {
+ font-size: 30rpx;
+ border-bottom: 2rpx solid #dcdcdc;
+ width: 100%;
+ /* text-align: left; */
+ padding: 4rpx 0;
+ /* overflow: hidden; */
+ height: 90rpx;
+ word-break: break-all;
+ /* text-overflow: ellipsis;
+ white-space: nowrap;
+ line-height: 48rpx; */
+}
+
+.sp_wz .sp_jg {
+ color: #c4182e;
+ font-size: 30rpx;
+ overflow: hidden;
+ display: inline-block;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ margin-right: 10rpx;
+}
+
+.sp_wz .sp_jgx {
+ color: #adadad;
+ text-decoration: line-through;
+ font-size: 24rpx;
+ overflow: hidden;
+ display: inline-block;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.one {
+ margin-left: 14rpx;
+}
+
+.sp .sp_top .s_top1_kill {
+ position: absolute;
+ background-color: #c4182e;
+ font-size: 24rpx;
+ height: 38rpx;
+ line-height: 38rpx;
+ left: 265rpx;
+ top: 100rpx;
+ padding: 0 10rpx;
+ color: white;
+ border-radius: 10rpx;
+}
+
+.sp .sp_top .s_top2_kill {
+ position: absolute;
+ background-color: #c4182e;
+ font-size: 24rpx;
+ height: 38rpx;
+ line-height: 38rpx;
+ right: 146rpx;
+ top: 100rpx;
+ padding: 0 10rpx;
+ color: white;
+ border-radius: 10rpx;
+}
+
+.sp .sp_top .s_foot1_kill {
+ font-size: 20rpx;
+ position: absolute;
+ top: 270rpx;
+ width: 210rpx;
+ height: 38rpx;
+ line-height: 38rpx;
+ color: #fff;
+ text-align: center;
+ background-color: rgba(0, 0, 0, 0.5);
+}
+
+.po1 {
+ position: absolute;
+}
+
+.sp .sp_top .s_foot2_kill {
+ font-size: 20rpx;
+ position: absolute;
+ top: 270rpx;
+ width: 210rpx;
+ height: 38rpx;
+ line-height: 38rpx;
+ color: #fff;
+ text-align: center;
+ background-color: rgba(0, 0, 0, 0.5);
+}
+
+.sp2 {
+ width: 100%;
+ min-height: 240rpx;
+}
+
+.sp2 .one1 {
+ background-color: white;
+ height: 285rpx;
+ display: flex;
+ padding:0rpx 20rpx;
+ border-bottom: 6rpx#eee solid;
+ align-items: center;
+}
+
+.sp2 .one1 .o1_img {
+ width: 220rpx;
+ height: 220rpx;
+ margin-right: 25rpx;
+}
+
+.o1_right .sp_wzi {
+ font-size: 30rpx;
+ margin-bottom: 6rpx;
+ /* text-align: left; */
+ padding: 4rpx 0;
+ height: 90rpx;
+ /* overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis; */
+}
+
+.o1_right .o1_sj_kill {
+ height: 60rpx;
+ margin-bottom: 10rpx;
+ font-size: 28rpx;
+}
+
+.o1_right .o1_sj_kill text {
+ background-color: #fdcb08;
+ text-align: center;
+ border-radius: 10rpx;
+ padding: 4rpx;
+ margin-left: 6rpx;
+}
+
+.o1_right .sp_jg {
+ color: #c4182e;
+ font-size: 30rpx;
+ overflow: hidden;
+ display: inline-block;
+ margin-right: 10rpx;
+}
+
+.o1_right .sp_jgx {
+ color: #dcdcdc;
+ text-decoration: line-through;
+ font-size: 26rpx;
+ overflow: hidden;
+ display: inline-block;
+}
+
+.o1_img image {
+ width: 220rpx;
+ height: 220rpx;
+}
+.o1_right{
+ width: 465rpx;
+}
+.o1_right .wo {
+ background-color: #c4182e;
+ width: 150rpx;
+ height: 50rpx;
+ line-height: 50rpx;
+ color: white;
+ text-align: center;
+ font-size: 30rpx;
+ border-radius: 14rpx;
+}
+.rob{
+ display: flex;
+ justify-content: flex-end;
+ font-size: 30rpx;
+}
+.money{
+ display: flex;
+ align-items: center;
+}
+
+.sp .sp_top .s_top_kill.gray{background-color:#bdbdc1;color: #fff;font-weight: normal}
+
+
+.ellipsis-2 {
+
+ height: 110rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+}
+.ellipsis-2n {
+
+ /* height: 97rpx; */
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+}
+.pdlf10{
+ padding: 0 10rpx;
+}
+.new_item1{
+ width: 100%;
+ overflow: hidden;
+}
+
+.new_item1_image{
+ width: 100%;
+ /* max-width: 100%;
+ max-height: 100%; */
+}
+.new_item1_time{
+ height: 50rpx;
+ background: #f23030;
+ color: #fff;
+ /* font-size: 25rpx; */
+ font-size: 24rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ opacity:.8;
+ /* padding: 0rpx 30rpx; */
+
+}
+.new_item1_time image{
+ width: 188rpx;
+ height: 52rpx;
+}
+.new_item1_goods_name{
+ padding: 10rpx 10rpx 0rpx;
+ /* font-size: 26rpx; */
+ font-size: 28rpx;
+ width: 100%;
+ box-sizing: border-box;
+ color: #333333;
+}
+.new_item1_price{
+ display: flex;
+ /* padding: 0 10rpx; */
+ align-items: center;
+ justify-content: space-between;
+ /* font-size: 26rpx; */
+ font-size: 24rpx;
+ padding: 0 10rpx 10rpx;
+}
+.clor{
+ /* color: rgba(196, 24, 45, 1); */
+ color: #ec0022;
+}
+.clor7b{
+ color: #7b7b7b;
+}
+.new_item1_but{
+ width: 130rpx;
+ height: 60rpx;
+ color: #fff;
+ background-color: #f23030;
+ line-height: 60rpx;
+ text-align: center;
+ border-radius: 15rpx;
+}
+.new_item1_but1{
+ border-radius: 50rpx !important;
+}
+.new_item1_but2{
+ border-radius: 50rpx !important;
+ background-color: rgba(0, 0, 0, 0) !important;
+ color: #f23030 !important;
+ border: 1rpx solid #f23030 !important;
+}
+.new_item1_but3{
+ background-color: rgba(0, 0, 0, 0) !important;
+ color: #f23030 !important;
+ border: 1rpx solid #f23030 !important;
+}
+
+
+
+
+.new_item1_box{
+ /* padding-top: 17rpx; */
+ width: 100%;
+ box-sizing: border-box;
+ overflow: hidden;
+}
+
+.aborder{
+ border: 1px solid #e8e8e8;
+}
+.bgf{
+ background-color: #fff;
+}
+.boxsha{
+ /* box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); */
+ /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
+ box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 3px 10px 0 rgba(0, 0, 0, 0.19);
+}
+.but_radius85{
+ border-radius:289rpx;
+}
+.but_radius5{
+ border-radius:8px;
+}
+.imgBox{
+ position: relative;
+}
+.imgBox_img{
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 74rpx;
+ height: 70rpx;
+
+}
+
+.aspect_ratio1{
+ aspect-ratio:1/1;
+}
+.aspect_ratio2{
+ aspect-ratio:16/9;
+}
+.aspect_ratio3{
+ aspect-ratio:3/2;
+}
+.aspect_ratio4{
+ aspect-ratio:3/4;
+}
+.container1 {
+ position: relative;
+ width:100%;
+ padding-top: 100%;
+ overflow: hidden;
+}
+.container2 {
+ position: relative;
+ width:100%;
+ padding-top: 56.25%;
+ overflow: hidden;
+}
+.container3 {
+ position: relative;
+ width:100%;
+ padding-top: 66.67%;
+ overflow: hidden;
+}
+.container4 {
+ position: relative;
+ width:100%;
+ padding-top: 133.33%;
+ overflow: hidden;
+
+}
+
+.images1 {
+ display: block;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ object-fit: cover;
+
+}
+
+.flex2{
+ display: flex;
+ /* align-items: center; */
+ justify-content: space-between;
+ flex-wrap: wrap;
+ box-sizing: border-box;
+}
+.flex2:after {
+ content: "";
+ width: 30%;
+ height: 0px;
+ visibility: hidden;
+ }
+
+ .boxpad{
+ /* padding:11rpx 9rpx; */
+ box-sizing: border-box;
+ }
+ .pricefs28{
+ font-size: 28rpx !important;
+ }
+ .pricefs42{
+ font-size: 42rpx !important;
+ }
+ .pricefs38{
+ font-size: 38rpx !important;
+ }
+ .imgbox1{
+ width: 60rpx;
+ height: 60rpx;
+ }
+ .topBox{
+ position: relative;
+ }
+
+ .item_float{
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ box-sizing: border-box;
+ }
+ .buy_box{
+ display: flex;
+ margin: 10rpx 0 0 10rpx;
+ width: 100%;
+ }
+ .buy_box view{
+ padding: 10rpx;
+ background-color:#f23030;
+ color: #fff;
+ /* margin-top: 10rpx; */
+ line-height: 28rpx;
+ border-radius: 10rpx;
+ }
+ .mgr10{
+ margin-right: 10rpx;
+ }
+ .fs24{
+ font-size: 24rpx;
+ }
+ .lineh24{
+ line-height: 24rpx !important;
+ }
\ No newline at end of file
diff --git a/pages/index/index/index.json b/pages/index/index/index.json
index 5cc0ca5..4269168 100644
--- a/pages/index/index/index.json
+++ b/pages/index/index/index.json
@@ -9,6 +9,7 @@
"searchbox":"/components/diy_searchbox/diy_searchbox",
"shopname": "/components/diy_shopname/diy_shopname",
"pingd_buy": "/components/diy_pingd_buy/diy_pingd_buy",
+ "div_public": "/components/diy_public/diy_public",
"title": "/components/diy_title/diy_title",
"notice": "/components/diy_notice/diy_notice",
"voice": "/components/diy_voice/diy_voice",
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 0766a90..5c9ab1d 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -480,6 +480,9 @@
+
+
+
diff --git a/pages/template/index.json b/pages/template/index.json
index dca47df..42bc7a2 100644
--- a/pages/template/index.json
+++ b/pages/template/index.json
@@ -11,6 +11,7 @@
"searchbox":"/components/diy_searchbox/diy_searchbox",
"shopname": "/components/diy_shopname/diy_shopname",
"pingd_buy": "/components/diy_pingd_buy/diy_pingd_buy",
+ "diy_public": "/components/diy_public/diy_public",
"title": "/components/diy_title/diy_title",
"notice": "/components/diy_notice/diy_notice",
"voice": "/components/diy_voice/diy_voice",
diff --git a/pages/template/index.wxml b/pages/template/index.wxml
index 7ca759f..5ac9144 100644
--- a/pages/template/index.wxml
+++ b/pages/template/index.wxml
@@ -37,6 +37,9 @@
+
+
+