chore：合并了文章列表改为新闻

.local.config.js

@@ -32,7 +32,7 @@ const localDevConfig = ({
 	},
 	'2812': { // IVD数商模式
 		uniacid: 2812,
-		     domain: 'https://xcx.aigc-quickapp.com/',
+		domain: 'https://xcx6.aigc-quickapp.com/',
 	},
 	'1': { // 开发平台
 		uniacid: 1,
@@ -42,6 +42,6 @@ const localDevConfig = ({
 		uniacid: 1,
 		domain: 'https://test.aigc-quickapp.com',
 	},
-})['2811']; // 选择要使用的环境配置
+})['2812']; // 选择要使用的环境配置
 
 export default localDevConfig;

common/js/config.js

@@ -77,16 +77,16 @@ export default {
      * 然后将 site.js 文件放到 `unpackage\dist\build\mp-weixin\` 目录下面
      */
     // 商户ID
-    uniacid: 2812, //825
+    uniacid: uniacid, //825
 
     //api请求地址
-    baseUrl: 'https://xcx.aigc-quickapp.com/',
+    baseUrl: domain,
 
     // 图片域名
-    imgDomain:'https://xcx.aigc-quickapp.com/',
+    imgDomain: domain,
 
     // H5端域名
-    h5Domain:'https://xcx.aigc-quickapp.com/',
+    h5Domain: domain,
 
     // // api请求地址
     // baseUrl: 'https://tsaas.liveplatform.cn/',

common/js/util.js

@@ -130,7 +130,9 @@ export default {
 	 */
 	redirectTo(to, param = {}, mode = 'navigateTo') {
 		let url = to;
-
+ if (to.indexOf('/article/list') !== -1) {
+        mode = 'reLaunch';
+    }
 		// 替换url中的前缀
 		console.log('页面跳转 redirectTo', to, param, mode);
 		url = adaptSubpackageUrl(url);

components/hover-nav/hover-nav.vue

@@ -17,24 +17,6 @@
       <text class="ai-icon" v-if="!aiAgentimg">🤖</text>
     </view>
 
-    <!-- 微信小程序客服按钮 -->
-    <!-- #ifdef MP-WEIXIN -->
-    <button class="btn-item common-bg" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true"
-      :style="[{ backgroundImage: kefuimg ? `url(${kefuimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
-      <text class="icox icox-kefu" v-if="!kefuimg"></text>
-    </button>
-    <!-- #endif -->
-
-    <!-- 普通客服（仅当未启用 AI 时显示） -->
-    <!-- #ifdef H5 -->
-    <template v-if="fixBtnShow">
-      <button class="btn-item common-bg" hoverClass="none" @click="openCustomerSelectPopup"
-        :style="[{ backgroundImage: kefuimg ? `url(${kefuimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">
-        <text class="icox icox-kefu" v-if="!kefuimg"></text>
-      </button>
-    </template>
-    <!-- #endif -->
-
     <!-- 电话按钮（始终显示） -->
     <view v-if="fixBtnShow" class="btn-item common-bg" @click="call()"
       :style="[{ backgroundImage: phoneimg ? `url(${phoneimg})` : '', backgroundSize: '100% 100%' }, customButtonStyle]">

lang/zh-cn/article/detail.js

@@ -1,4 +1,4 @@
 export const lang = {
 	//title为每个页面的标题
-	title: '文章详情'
+	title: '新闻'
 }

pages.json

@@ -3,8 +3,7 @@
         {
             "path": "pages/index/index",
             "style": {
-				// "navigationStyle": "custom",
-				"enablePullDownRefresh": true
+                "navigationStyle": "custom"
             }
         },
         {
@@ -20,7 +19,6 @@
             "pages": []
         },
         {
-			//******************商品模块分包******************
             "root": "pages_goods",
             "pages": [
                 {
@@ -58,7 +56,6 @@
             ]
         },
         {
-			//******************订单模块分包******************
             "root": "pages_order",
             "pages": [
                 {
@@ -99,7 +96,6 @@
                         // #endif
                     }
                 },
-				//积分订单详情
                 {
                     "path": "detail_point",
                     "style": {
@@ -111,10 +107,8 @@
             ]
         },
         {
-			//******************营销活动模块（26）******************
             "root": "pages_promotion",
             "pages": [
-				//----------积分模块（2）----------
                 {
                     "path": "point/list",
                     "style": {
@@ -159,7 +153,6 @@
                         // #endif
                     }
                 },
-				//****************** 商户 ******************
                 {
                     "path": "merch/merchcategory",
                     "style": {
@@ -178,7 +171,6 @@
                         "navigationBarTitleText": "商户首页"
                     }
                 },
-				//****************** 分销 ******************
                 {
                     "path": "fenxiao/index",
                     "style": {
@@ -312,7 +304,6 @@
             ]
         },
         {
-			//*****************其他模块（26）******************
             "root": "pages_tool",
             "pages": [
                 {
@@ -356,7 +347,6 @@
                         "enablePullDownRefresh": true
                     }
                 },
-				//******************会员模块（20）******************
                 {
                     "path": "member/index",
                     "style": {
@@ -594,7 +584,6 @@
                         // #endif
                     }
                 },
-				//******************登录模块******************
                 {
                     "path": "login/find",
                     "style": {
@@ -603,7 +592,6 @@
                         // #endif
                     }
                 },
-				//******************商品模块******************
                 {
                     "path": "goods/coupon",
                     "style": {
@@ -652,7 +640,6 @@
                         // #endif
                     }
                 },
-				//******************CMS模块（6）******************
                 {
                     "path": "help/list",
                     "style": {
@@ -701,14 +688,13 @@
                         // #endif
                     }
                 },
-				//******************会员充值（4）******************
                 {
                     "path": "recharge/list",
                     "style": {
                         // #ifdef APP-PLUS
                         "navigationStyle": "custom",
                         // #endif
-						"scrollEnabled": true // 禁止页面滚动
+                        "scrollEnabled": true
                     }
                 },
                 {
@@ -719,7 +705,6 @@
                         // #endif
                     }
                 },
-				//******************邀请******************
                 {
                     "path": "member/invite_friends",
                     "style": {
@@ -728,7 +713,6 @@
                         // #endif
                     }
                 },
-				//******************支付模块（2）******************
                 {
                     "path": "pay/index",
                     "style": {
@@ -769,7 +753,6 @@
                         // #endif
                     }
                 },
-				//******************订单模块（2）******************
                 {
                     "path": "order/logistics",
                     "style": {
@@ -843,7 +826,6 @@
                         // #endif
                     }
                 },
-				//******************登录模块（3）******************
                 {
                     "path": "login/login",
                     "style": {
@@ -878,7 +860,6 @@
                         "navigationBarTitleText": "小程序发货"
                     }
                 },
-				//******************介质材料模块******************	
                 {
                     "path": "seal/structure",
                     "style": {
@@ -906,7 +887,6 @@
                         "navigationBarTitleText": "搜索结果"
                     }
                 },
-				//******************案例展示******************
                 {
                     "path": "cases/index",
                     "style": {
@@ -916,7 +896,6 @@
                         "navigationBarTitleText": "案例展示"
                     }
                 },
-				//******************文件模块******************
                 {
                     "path": "files/list",
                     "style": {
@@ -968,10 +947,8 @@
             "x-skeleton": "@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue",
             "mp-html": "@/uni_modules/mp-html/components/mp-html/mp-html.vue",
             "uni-*(\\W.*)": "@/uni_modules/uni$1/components/uni$1/uni$1.vue",
-
             "mescroll-uni": "@/components/mescroll/my-list-mescroll.vue",
             "ns-goods-sku-*(\\W.*)": "@/components/ns-goods-sku/ns-goods-sku$1.vue",
-
             "diy-*(\\W.*)": "@/components-diy/diy$1.vue"
         }
     },

pages_tool/article/detail.vue

@@ -19,17 +19,24 @@
 
         <!-- 隐私弹窗 -->
         <privacy-popup ref="privacyPopup"></privacy-popup>
+
+        
+        <view class="page-bottom" v-if="openBottomNav">
+            <diy-bottom-nav @callback="callback" :name="name" />
+        </view>
     </view>
 </template>
 
 <script>
-	import htmlParser from '@/common/js/html-parser';
-	export default {
+import htmlParser from '@/common/js/html-parser';
+export default {
     data() {
         return {
             articleId: 0,
             detail: {},
-				content: ''
+            content: '',
+            openBottomNav: true, 
+            name: 'article'     
         };
     },
     onLoad(options) {
@@ -83,6 +90,8 @@
                 link: shareUrl,
                 imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
             });
+        },
+        callback(data) {
         }
     },
     onShareAppMessage(res) {
@@ -95,7 +104,7 @@
             fail: res => {}
         };
     },
-		//分享到朋友圈
+    // 分享到朋友圈
     onShareTimeline() {
         var title = this.detail.article_title;
         var query = 'article_id=' + this.articleId;
@@ -105,30 +114,30 @@
             imageUrl: ''
         };
     }
-	};
+};
 </script>
 
 <style lang="scss">
-	.page {
+.page {
     width: 100%;
     height: 100%;
     padding: 30rpx;
     box-sizing: border-box;
     background: #ffffff;
-	}
+}
 
-	.help-title {
+.help-title {
     font-size: $font-size-toolbar;
     text-align: left;
     font-weight: bold;
-	}
+}
 
-	.help-content {
+.help-content {
     margin-top: $margin-updown;
     word-break: break-all;
-	}
+}
 
-	.help-meta {
+.help-meta {
     text-align: left;
     margin-top: $margin-updown;
     color: $color-tip;
@@ -136,9 +145,9 @@
     .help-time {
         font-size: $font-size-tag;
     }
-	}
+}
 
-	.bottom-area {
+.bottom-area {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -152,5 +161,12 @@
         color: #999;
         font-size: 24rpx;
     }
-	}
+}
+.page-bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    z-index: 999;
+}
 </style>

pages_tool/article/list.vue

@@ -1,13 +1,25 @@
 <template>
     <view :style="themeColor">
+        <!-- 主内容区域 -->
+        <view
+            class="page-img"
+            :style="{
+                backgroundColor: bgColor,
+                minHeight: openBottomNav ? 'calc(100vh - 55px)' : '100vh'
+            }"
+        >
             <mescroll-uni @getData="getData" ref="mescroll">
                 <block slot="list">
                     <view class="article-wrap" v-if="list.length">
                         <ns-adv keyword="NS_ARTICLE" class-name="adv-wrap"></ns-adv>
                         <view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)">
                             <view class="article-img">
-							<image class="cover-img" :src="$util.img(item.cover_img)" mode="widthFix"
-								@error="imgError(index)" />
+                                <image
+                                    class="cover-img"
+                                    :src="$util.img(item.cover_img)"
+                                    mode="widthFix"
+                                    @error="imgError(index)"
+                                />
                             </view>
                             <view class="info-wrap">
                                 <text class="title">{{ item.article_title }}</text>
@@ -21,7 +33,9 @@
                             </view>
                         </view>
                     </view>
-				<view v-else class="empty-wrap"><ns-empty text="暂无文章" :isIndex="false"></ns-empty></view>
+                    <view v-else class="empty-wrap">
+                        <ns-empty text="暂无文章" :isIndex="false"></ns-empty>
+                    </view>
                     <loading-cover ref="loadingCover"></loading-cover>
                 </block>
             </mescroll-uni>
@@ -29,13 +43,21 @@
             <!-- 隐私弹窗 -->
             <privacy-popup ref="privacyPopup"></privacy-popup>
         </view>
+        <view class="page-bottom" v-if="openBottomNav">
+            <diy-bottom-nav @callback="callback" :name="name" />
+        </view>
+    </view>
 </template>
 
 <script>
 export default {
     data() {
         return {
-			list: []
+            list: [],
+            
+            openBottomNav: true, 
+            name: 'article',     
+            bgColor: '#ffffff' 
         };
     },
     onShow() {
@@ -60,9 +82,8 @@ export default {
                         });
                     }
                     mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
-					this.list = this.list.concat(newArr); //追加新数据
+                    if (mescroll.num == 1) this.list = [];
+                    this.list = this.list.concat(newArr);
                     if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
                 },
                 fail: res => {
@@ -79,7 +100,6 @@ export default {
         imgError(index) {
             if (this.list[index]) this.list[index].cover_img = this.$util.getDefaultImage().article;
         },
-		// 设置公众号分享
         setPublicShare() {
             let shareUrl = this.$config.h5Domain + '/pages_tool/article/list';
             this.$util.setPublicShare({
@@ -88,6 +108,8 @@ export default {
                 link: shareUrl,
                 imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
             });
+        },
+        callback(data) {
         }
     },
     onShareAppMessage(res) {
@@ -96,11 +118,10 @@ export default {
         return {
             title: title,
             path: path,
-			success: res => { },
-			fail: res => { }
+            success: res => {},
+            fail: res => {}
         };
     },
-	//分享到朋友圈
     onShareTimeline() {
         var title = '新闻';
         var query = '/pages_tool/article/list';
@@ -212,4 +233,11 @@ export default {
         }
     }
 }
+.page-bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    z-index: 999;
+}
 </style>