Merge remote-tracking branch 'origin/develop/3.2.1' into develop/3.2.1

src/api/activity.js

@@ -1,6 +1,16 @@
 import request from '@/utils/request'
 const header = getApp().globalData.userInfo
 
+// 联通流量兑换活动详情
+export function newDetail(data) {
+  return request({
+    url: `/admin/activity/addOrUpdate`,
+    header,
+    method: 'post',
+    data
+  })
+}
+
 // 活动详情
 export function detail(data) {
   return request({

src/pages.json

@@ -2,8 +2,7 @@
 	"easycom": {
 		"^z-(.*)": "@zebra-ui/swiper/components/z-$1/z-$1.vue"
 	},
-	"pages": [
-		{
+	"pages": [{
 			// 设备引导页
 			"path": "pages/guide/index",
 			"style": {
@@ -133,6 +132,13 @@
 			}
 		},
 		{
+			// 活动页面 新需求，充值联通流量
+			"path": "pages/activity/new",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
 			// 协议页面
 			"path": "pages/agreement/index",
 			"style": {
@@ -176,7 +182,7 @@
 				"navigationStyle": "custom"
 			}
 		},
-			// 喜马拉雅充值失败
+		// 喜马拉雅充值失败
 		{
 			"path": "pages/ximalaya/error",
 			"style": {
@@ -191,7 +197,7 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{	
+		{
 			// 开通记录
 			"path": "pages/pay/detail",
 			"style": {