diff --git a/app.js b/app.js
index 5674e25..27d1550 100644
--- a/app.js
+++ b/app.js
@@ -51,7 +51,7 @@ App({
         config: null,   //门店参数
         config2: null,  //门店配置
         code: null,
-        user_id:null,//6520390,//6520352
+        user_id:null,//15240065,//6520352,//6520390,//6520352
         // user_id:6520314,// qa-6519858,//
         // user_id:14148118,// qa-6519858,//
         buy_now: null,
@@ -766,6 +766,7 @@ App({
                 th.globalData.storeFooter = null;   //底部的导航
                 th.globalData.full_screen = null;   //全屏
                 th.globalData.guide_pick_id = null;   //分享导购门店的优化
+                th.globalData.fuiou_pay = null;   //分享导购门店的优化
             } else {
                 th.globalData.no_clear = 0;
             }
@@ -1541,8 +1542,72 @@ App({
        }
        //没有等级卡和新人有礼的时候
        if(func)  func();
+   },
+
+   //content是映射的标题，goods_content是富文本的内容,
+   //a是wxpares插件 e是common.js th是页面的指针
+   async deal_iframe(a,e,content,goods_content,th){
+
+       if (goods_content == null) goods_content = "";
+       //-----商品详情---
+       if (!goods_content) goods_content = "  ";
+
+       //用内存对象
+       var ob={text:''};
+       if(goods_content){
+            ob.text=goods_content;
+            await this.deal_iframe_next(ob)
+       }
+       a.wxParse(content, "html", ut.format_content(ob.text), th, 6);
+       e.wxParseAddFullImageUrl(th, content);
+   },
+
+   async deal_iframe_next(ob){
+       for(let i = 1; i > 0; i++){
+            //如果没有iframe语句的时候，就跳出循环
+            if(ob.text.indexOf('<iframe')<0) break
+            var start=ob.text.indexOf('<iframe');
+            var end=ob.text.indexOf('</iframe>');
+            //截取iframe的dom元素
+            var str=ob.text.substring(start, end+9);
+
+            var arr = str.split('vid=');
+            var arrs = arr[1].split('"');
+            /*	console.log("截取&前面的的"+arrs[0]);*/
+            var vipid = arrs[0];
+
+            //-- 用vipid调用接口，转换视频 --
+            var url = "https://vv.video.qq.com/getinfo?vid=" + vipid + "&platform=101001&charge=0&otype=json";
+            var res=await getApp().promiseGet(url,{})
+            if(res && res.data){
+               var dataJson = res.data.replace(/QZOutputJson=/, '') + "qwe";
+               var dataJson1 = dataJson.replace(/;qwe/, '');
+               var data = JSON.parse(dataJson1);
+               if (data.vl != undefined) {
+                   var host1 = data['vl']['vi'][0];
+                   var host2=host1['ul']['ui'];
+                   var len=host2.length-1;
+                   var host= host2[len]['url'];
+
+                   var fn = data.vl.vi[0].fn;
+                   var fvkey = data.vl.vi[0].fvkey;
+                   /* console.log("有参数吗"+fn+"有参数吗"+fvkey);*/
+                   var wxapp_url = host + fn + '?vkey=' + fvkey;
+                   var frame='<video src="'+wxapp_url+'" controls="controls"></video>';
+                   ob.text=ob.text.replaceAll(str,frame)
+               }
+               continue;
+            }else{
+              break;
+            }
+       }
    }
 
+
+
+
+
+
 });
 
     
diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js
index 992772e..a4c43be 100644
--- a/components/diy_seckill/diy_seckill.js
+++ b/components/diy_seckill/diy_seckill.js
@@ -245,7 +245,7 @@ Component({
         }
 
         //控制已售罄是否显示
-        if (!th.data.object.hide_sold_out_items) {
+        if (th.data.object.column_action_name &&  !th.data.object.hide_sold_out_items) {
           all_array=empty
         }
 
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index c578e9b..113eafc 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1125,13 +1125,13 @@ Page({
                 if (t.data.data.original_img.indexOf(o.imghost) == -1)
                   t.data.data.original_img = o.imghost + t.data.data.original_img;
 
+                /* -----商品详情---
                 if (t.data.data.goods_content == null) t.data.data.goods_content = "";
-
-                //-----商品详情---
                 if (!t.data.data.goods_content) t.data.data.goods_content = "  ";
-
                 a.wxParse("content", "html", ut.format_content(t.data.data.goods_content), ee, 6);
-                e.wxParseAddFullImageUrl(ee, "content");
+                e.wxParseAddFullImageUrl(ee, "content");--*/
+
+                getApp().deal_iframe(a,e,'content',t.data.data.goods_content,ee);
 
                 //if (ee.data.prom_type) {
                 t.data.data.prom_type = ee.data.prom_type;