Merge branch 'develop' of zhengxifeng/zc100 into master

application/admin/controller/Archives.php

@@ -1338,7 +1338,7 @@ class Archives extends Base
             //$topid = Db::name('arctype')->where('id','=',$typeid)->value('topid');
             $cat = Db::name('arctype')->where(['id'=>$typeid])->find();
             $vb = ['qkmc','zbdw','yxyz','zgdw','jb','gnkh','slzt','jytg'];
-            $vbs = ['content_5','down','imgs','pagenum','content_4','zylm']; //保留两者
+            $vbs = ['content_5','down','imgs','pagenum','content_4','zylm','wplj','tqm']; //保留两者
             if((int)$cat['topid'] === 38){
                 //删除期刊
                 foreach ($addonFieldExtList as $key=>$item){

template/mobile/view_zczygz_cl.htm

@@ -31,6 +31,22 @@
     <div style="padding: 50px  15px 40px 15px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
 
         <fieldset class="layui-elem-field" style="width:100%;text-align: center;">
+            <legend style="font-size: 17px;margin-left:0px;">网盘链接:</legend>
+            <div class="layui-field-box" style="text-align: center;">
+                {$eyou.field.wplj}
+            </div>
+        </fieldset>
+
+        {eyou:if condition='(!empty($eyou.field.tqm))'}
+        <fieldset class="layui-elem-field" style="width:100%;text-align: center;">
+            <legend style="font-size: 17px;margin-left:0px;">提取码:</legend>
+            <div class="layui-field-box" style="text-align: center;">
+                {$eyou.field.tqm}
+            </div>
+        </fieldset>
+        {/eyou:if}
+
+       <!-- <fieldset class="layui-elem-field" style="width:100%;text-align: center;">
             <legend style="font-size: 17px;margin-left:0px;">第一步: 扫一扫{eyou:global name='web_attrname_30' /}</legend>
             <div class="layui-field-box" style="text-align: center;">
                 <img src="{eyou:global name='web_attr_30' /}" style="width: 150px;"/>
@@ -43,7 +59,7 @@
 
                 <img src="{eyou:global name='web_attr_26' /}" style="width: 150px;"/>
             </div>
-        </fieldset>
+        </fieldset>-->
     </div>
 </div>
 
@@ -94,11 +110,11 @@
                     type: 1
                     ,title: false //不显示标题栏
                     ,closeBtn: false
-                    ,area: '300px;'
+                    ,area: '90%;'
                     ,shade: 0.8
                     ,id: 'LAY_layuipro' //设定一个id，防止重复弹出
                     //,btn: ['火速围观', '残忍拒绝']
-                    ,btn: ['关闭']
+                    ,btn: ['打开链接','复制链接','关闭']
                     ,btnAlign: 'c'
                     ,moveType: 1 //拖拽模式，0或者1
                     ,content: $('#buy').html()
@@ -108,6 +124,28 @@
                             href: 'http://www.layui.com/'
                             ,target: '_blank'
                         });*/
+
+                        var btn = layero.find('.layui-layer-btn');
+                        btn.find('.layui-layer-btn0').attr({
+                            href: '{$eyou.field.wplj}'
+                            ,target: '_blank'
+                        });
+                        btn.find('.layui-layer-btn1').click(function(){
+                            let text = "{$eyou.field.wplj}";
+                            let longPressTimer = null;
+
+                            // 复制方法
+                            // 关键
+                            navigator.clipboard
+                                .writeText(text)
+                                .then(() => {
+                                    window.alert("复制成功");
+                                })
+                                .catch((error) => {
+                                    window.alert("复制失败", error);
+                                });
+                        });
+
                     }
                 });
             }

template/pc/components/detail/cl.htm

@@ -74,7 +74,10 @@
                                     <i>¥</i>
                                     <span class="more2_info_price_txt">{$eyou.field.users_price}.<span class="more2_info_price_txt-decimal">00</span>
                                      </span>
+                            <span style="color:red;">👍<font style="font-weight: bold;">限时免费赠送</font></span>
                                 </span>
+
+
                     </p>
 
                     <p class="site"><font>购买须知：</font>  本产品为电子档文件，属虚拟产品，付款后请联系客服领取，一经售出概不退换！</p>
@@ -104,7 +107,7 @@
                     </p>
 
                     <a class="btn transition layui-btn-s" target="_self" data-method="notice" href="javascript:;" >
-                        购买产品
+                        点击领取
                         <i class="fa fa-chevron-circle-right"></i>
                     </a>
 

template/pc/view_zczygz_cl.htm

@@ -25,7 +25,25 @@
 
 <div id="buy" style="display: none;">
     <div style="padding: 50px  15px 40px 15px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
+
         <fieldset class="layui-elem-field" style="width:100%;text-align: center;">
+            <legend style="font-size: 17px;margin-left:0px;">网盘链接:</legend>
+            <div class="layui-field-box" style="text-align: center;">
+                {$eyou.field.wplj}
+            </div>
+        </fieldset>
+
+        {eyou:if condition='(!empty($eyou.field.tqm))'}
+            <fieldset class="layui-elem-field" style="width:100%;text-align: center;">
+                <legend style="font-size: 17px;margin-left:0px;">提取码:</legend>
+                <div class="layui-field-box" style="text-align: center;">
+                    {$eyou.field.tqm}
+                </div>
+            </fieldset>
+        {/eyou:if}
+
+
+        <!--<fieldset class="layui-elem-field" style="width:100%;text-align: center;">
             <legend style="font-size: 17px;margin-left:0px;">第一步: 扫一扫{eyou:global name='web_attrname_30' /}</legend>
             <div class="layui-field-box" style="text-align: center;">
                 <img src="{eyou:global name='web_attr_30' /}" style="width: 150px;"/>
@@ -38,7 +56,7 @@
 
                 <img src="{eyou:global name='web_attr_26' /}" style="width: 150px;"/>
             </div>
-        </fieldset>
+        </fieldset>-->
     </div>
 </div>
 
@@ -89,20 +107,35 @@
                     type: 1
                     ,title: false //不显示标题栏
                     ,closeBtn: false
-                    ,area: '300px;'
+                    ,area: '600px;'
                     ,shade: 0.8
                     ,id: 'LAY_layuipro' //设定一个id，防止重复弹出
                     //,btn: ['火速围观', '残忍拒绝']
-                    ,btn: ['关闭']
+                    ,btn: ['打开链接','复制链接','关闭']
                     ,btnAlign: 'c'
                     ,moveType: 1 //拖拽模式，0或者1
                     ,content: $('#buy').html()
                     ,success: function(layero){
-                        /*var btn = layero.find('.layui-layer-btn');
+                        var btn = layero.find('.layui-layer-btn');
                         btn.find('.layui-layer-btn0').attr({
-                            href: 'http://www.layui.com/'
+                            href: '{$eyou.field.wplj}'
                             ,target: '_blank'
-                        });*/
+                        });
+                        btn.find('.layui-layer-btn1').click(function(){
+                            let text = "{$eyou.field.wplj}";
+                            let longPressTimer = null;
+
+                            // 复制方法
+                            // 关键
+                            navigator.clipboard
+                                .writeText(text)
+                                .then(() => {
+                                    window.alert("复制成功");
+                                })
+                                .catch((error) => {
+                                    window.alert("复制失败", error);
+                                });
+                        });
                     }
                 });
             }