feat: 整理

README.md

@@ -1,18 +1,19 @@
-一 首页
+一 首页 pages/index/index
 1. 轮播 -> 抽一番赏
 2. 会员权益  vip会员  签到  自主积分  会员活动  商务合作
 3. 最新推荐  -> 店铺相关推荐
 
-二  会员权益
+二  会员权益 
 1. 普通会员  vip会员
 2. 权益名称 所属会员  logo  介绍  权重
 
-三 vip会员
+三 vip会员 
 1. 介绍页 写死，权限只是展示，不可点击，
 2. 已开通 不显示开通按钮
 3. 点击立即开通，弹出弹框，限时 开通会员名称 会员有效期 开始/结束时间。
 
-四  签到  和 初见潮玩 保持一致
+四  签到 pages/task/index
+1. 和 初见潮玩 保持一致 
 
 五自主积分  和 大悦城保持一致
 1. 卡片  显示当前积分
@@ -22,15 +23,15 @@
 五.1 积分商城(兑换)
 1. 商品列表(图片/标题/积分/兑换按钮/状态)
 
-六 会员活动
-1. 显示活动列表(图片/名称/时间)
-2. 活动详情（标题/时间/详情(img)/规则/按钮(有些有/有些没)）
+六 会员活动 
+1. 显示活动列表(图片/名称/时间) pages/activity/index
+2. 活动详情（标题/时间/详情(img)/规则/按钮(有些有/有些没)）  pages/activity/detail?id=xxx
 
-七 商务合作 (招商人信息(名称/邮箱/电话))
+七 商务合作 (招商人信息(名称/邮箱/电话)) pages/help/contact
 
-八 我的(我的信息/马上加入vip会员/卡片/我的卡包入口)
+八 我的(我的信息/马上加入vip会员/卡片/我的卡包入口)  pages/my/my
 
-九  我的卡包
+九  我的卡包 pages/my/coupon
 1. 可用/历史
    - 物品/优惠券
 

package.json

@@ -49,8 +49,7 @@
     "lint": "vue-cli-service lint",
     "format": "prettier --write {scripts,types,src}/**/*.{ts,vue,js,less,scss} types/**/*.ts",
     "prepare": "husky install",
-    "upload": "node scripts/upload.js",
-    "upload:mp-weixin": "node scripts/upload-mp-weixin.js"
+    "upload": "node scripts/upload-mp-weixin.js"
   },
   "dependencies": {
     "@dcloudio/uni-app": "2.0.2-alpha-3061220221207001",

scripts/private.wx090cc3b016e45bfe.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA287wf8N67vmqHWB2+5wMNc7TNN/lrupgAIzlUE3dKZzXxxPS
+SqeFIxojTVB9i4W6mI1kqC3ocgwbjHBT4YtE1KWzc9UdkhPnQ4OTS3BOFRcW7Q9Y
+PvPnymBfPHKy1zrTSl6xOUGWz1aky+4uhENTKSl8eABF2llLmV8czy2COtf1+MNk
+z3DCXQwNAQZ6giYe8ev+Oczs5xOW12y9fmoyXxIrGDjf3m1SimE8nkLW0ijB634h
+d44eT1p1cnkWU1nuZ1LVv4P5kiiT8WtoD+agqGkTODwQl5TUMDSr71o6COTy30hN
+JL5RHuzxUWdB5n/g8lRPVyx2e2XGd/eSOK2zMwIDAQABAoIBAFtMT/5xXl1mW+9J
+wwHtJfEvj/B1UvxdIzT3UMQTI1qGZ+WraPxTKmyTDbiuRwctq3xztixYrSS5vLOP
+cHfNFfDRRoFFMrwbAkK7ovGBmx0NcxtR9VBolI0tjEEaTwgwydQpEql6gb5q+ZYu
+vyl2oVMGhUl+q4Tu9ASnSdsPxvjTN6A92Td9am0KclwQT2OuqaPd8Cxoxq9xadh0
+oQQ2d+ZeXZUoItX2nIYzAq74/GH8FUSWwfNVtWKgtOXKT7sjBkmAzPmB9LrDoHm8
+iDVDJ1MC69oIFXa+GNuvSgpwAe0JMlu+a1AspngqIZdYiIvqS/R9phBsTR7YMOXW
+17bCzOECgYEA8j9d9vZQzryC8RtbZ7wlocKpvMjCRaW72eWcF/pPg9/GO8RWPhTF
+UUlX/RI2926Y1kOAIFUSDeJxyZhIPgWQmelnrEQnb4Y3Ql7UDp5E9Y/2USR0Z+r/
+aYuA/MwvMDxFnwoH4bZxnMdAUx55IRjbwp19MHvWl03Uy0QZHt7WQbECgYEA6El1
+l1QGvS4ct+KFVpR6MI098q9bOIixmtOHLvuv9VCQKj3yfPCf0+qtzzENL5c+tdPy
+2HppGRCj8pkD/9YPXISyy93WMZTD8vW7wTcQ9xKr7evnyhcJkOJWboC22gO9s0em
+bgVa6JrkXFqAz6qZ9BQ3XtNWkm+VQNoiNHBEOCMCgYBEsHEdcNSS+mMKqN4vOOtW
+xdLJZAeqJgdxDqlHJ0Paud4E3nQx4EPe+7QGX17UpDiUMMmo4VZgN4BaUGLTq1JI
+QiWSdDTWa7FJkYgBqSEWnD6U3YhgWwMXU2Y8yEztGXoIUZjQiKIIeXsk1nQ0TU8r
+DOsNj1/WwUwAYwvYdAk+0QKBgQDPeCUuV195gwElgI4FibIlQVIOO29nbDftiHba
+kPRVUHKjOBcoXqbyWU6Km04irpzVPIxPq+3I9GLqoJ7A18l6og8sJWRVfoERtUfQ
+SEW/2A51/9lUWAU0QeRe6FnpGaRKx3kwFVpgHVBP6InacY72QUQ/TtWpDz6o4Ovi
+GE/mLwKBgAdL4q+5Ra9yLu90yabvT4HSOY/flLclDxhe8pEU/wXqQZpdJAMfwbjA
+F0XSGoJO8F1RkisIdBbxxSQNXn2IavaNzmXDZ47r3vpIZQQr5SrwN6wXPLYcoYEb
+N+ejeFkAe8hTFroQuapxKWJNdV4oz7PuXvOavoCqo2OluY1AZU/a
+-----END RSA PRIVATE KEY-----

scripts/upload-mp-weixin.js

@@ -1,6 +1,5 @@
 const fs = require("fs");
 const path = require("path");
-const https = require("https");
 const ci = require("miniprogram-ci");
 const execSync = require("child_process").execSync;
 
@@ -8,19 +7,13 @@ const distDir = path.resolve(__dirname, "../dist");
 
 // 实例化小程序 ci
 const project = new ci.Project({
-  appid: "",
+  appid: "wx090cc3b016e45bfe",
   type: "miniProgram",
   projectPath: path.resolve(distDir, "./build/mp-weixin"),
-  privateKeyPath: path.resolve(__dirname, "./private..key"),
+  privateKeyPath: path.resolve(__dirname, "./private.wx090cc3b016e45bfe.key"),
   ignores: [],
 });
 
-// 钉钉webhook
-const dingTalkWebHook = `https://oapi.dingtalk.com/robot/send?access_token=${
-  process.env.DINGTALK_WEBHOOK_TOKEN || ""
-}`;
-
-const gitShortKey = execSync("git rev-parse --short HEAD").toString().trim();
 const gitCommitMsg = execSync("git log --pretty=format:“%s” -1")
   .toString()
   .trim()
@@ -36,60 +29,6 @@ if (process.env.change_desc && process.env.operator) {
   desc = `${process.env.operator}: ${process.env.change_desc}`;
 }
 
-// 发布钉钉通知
-const postDingTalk = (qrcode, isPro = false, version) => {
-  const ver = isPro ? "体验版" : "开发版";
-
-  const data = JSON.stringify({
-    msgtype: "markdown",
-    markdown: {
-      title: `小程序 【${ver}】上传成功`,
-      text: `# [小程序 【${ver}】](${qrcode})上传成功 \n\n @13718996400 \n\n > ${desc} ${
-        version ? `\n\n > version: ${version}` : ""
-      } \n\n ![小程序二维码](${qrcode})${
-        isPro
-          ? " \n\n 小程序发布请前往[小程序版本管理](https://mp.weixin.qq.com/)"
-          : ""
-      }`,
-    },
-    at: {
-      atMobiles: ["13718996400"],
-      atUserIds: [""],
-      isAtAll: false,
-    },
-  });
-  return new Promise((resolve, reject) => {
-    const req = https.request(
-      {
-        hostname: "oapi.dingtalk.com",
-        port: 443,
-        path: dingTalkWebHook,
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-      },
-      (res) => {
-        res.on("data", (d) => {
-          const resData = JSON.parse(d.toString());
-          if (res.statusCode === 200 && resData.errcode === 0) {
-            resolve(resData);
-          } else {
-            reject(resData);
-          }
-        });
-      }
-    );
-
-    req.on("error", (e) => {
-      reject(e);
-    });
-
-    req.write(data);
-    req.end();
-  });
-};
-
 const onProgressUpdate = (taskStatus) => {
   switch (taskStatus._status) {
     case "doing":
@@ -106,28 +45,22 @@ const preview = async () => {
   try {
     fs.mkdirSync(path.resolve(distDir, `./qrcode`));
   } catch (e) {}
-  const previewResult = await ci.preview({
+
+  await ci.preview({
     project,
     desc,
     setting: {},
     qrcodeFormat: "image",
-    qrcodeOutputDest: path.resolve(distDir, `./qrcode/${gitShortKey}.jpg`),
+    qrcodeOutputDest: path.resolve(distDir, `./qrcode/preview.jpg`),
     onProgressUpdate,
     pagePath: "pages/index/index", // 预览页面
     // searchQuery: 'a=1&b=2',  // 预览参数 [注意!]这里的`&`字符在命令行中应写成转义字符`\&`
   });
 
-  console.log("小程序上传完成🚀 ", previewResult);
-
-  try {
-    console.info("上传二维码完成 🚀", `/${gitShortKey}.jpg`);
-  } catch (e) {
-    console.info("上传出错，请检查网络或过会再试 ❌", e);
-    throw new Error(e);
-  }
-  try {
-    await postDingTalk(`/${gitShortKey}.jpg`);
-  } catch (e) {}
+  console.log(
+    "小程序上传完成🚀 ",
+    path.resolve(distDir, `./qrcode/preview.jpg`)
+  );
 };
 
 // 正式环境用体验版，上传至小程序后台
@@ -149,12 +82,6 @@ const publish = async () => {
     console.info("上传出错，请检查网络或过会再试 ❌", e);
     throw new Error(e);
   }
-
-  try {
-    await postDingTalk(`.jpg`, true, version);
-  } catch (e) {
-    console.log("钉钉通知失败：", e);
-  }
 };
 
 (async () => {

src/pages.json

@@ -34,10 +34,18 @@
         "backgroundColor": "#F5F5F5"
       }
     },
+    {
+      "path": "pages/activity/detail",
+      "style": {
+        "navigationBarTitleText": "活动中心",
+        "navigationBarBackgroundColor": "#FFFFFF",
+        "backgroundColor": "#F5F5F5"
+      }
+    },
     {
       "path": "pages/task/index",
       "style": {
-        "navigationBarTitleText": "积分任务",
+        "navigationBarTitleText": "签到",
         "navigationBarTextStyle": "white",
         "navigationBarBackgroundColor": "#30303A",
         "backgroundColor": "#F6F6F6"
@@ -46,7 +54,7 @@
     {
       "path": "pages/my/coupon",
       "style": {
-        "navigationBarTitleText": "红包卡券",
+        "navigationBarTitleText": "我的卡包",
         "enablePullDownRefresh": false
       }
     },
@@ -58,20 +66,27 @@
       }
     },
     {
-      "path": "pages/help/help_user",
+      "path": "pages/help/service",
       "style": {
         "navigationBarTitleText": "用户服务协议",
         "enablePullDownRefresh": false
       }
     },
     {
-      "path": "pages/help/help_about",
+      "path": "pages/help/contact",
       "style": {
-        "navigationBarTitleText": "关于我们",
+        "navigationBarTitleText": "商务合作",
         "enablePullDownRefresh": false
       }
     }
     // {
+    //   "path": "pages/help/help_about",
+    //   "style": {
+    //     "navigationBarTitleText": "关于我们",
+    //     "enablePullDownRefresh": false
+    //   }
+    // },
+    // {
     //   "path": "pages/index/list",
     //   "style": {
     //     "enablePullDownRefresh": true
@@ -141,13 +156,6 @@
     //   }
     // },
     // {
-    //   "path": "pages/help/help_contact",
-    //   "style": {
-    //     "navigationBarTitleText": "人工客服",
-    //     "enablePullDownRefresh": false
-    //   }
-    // },
-    // {
     //   "path": "pages/beto/beto",
     //   "style": {
     //     "navigationBarTitleText": "即将上线",
@@ -180,14 +188,6 @@
     //   }
     // },
     // {
-    //   "path": "pages/activity/detail",
-    //   "style": {
-    //     "navigationBarTitleText": "活动中心",
-    //     "navigationBarBackgroundColor": "#FFFFFF",
-    //     "backgroundColor": "#F5F5F5"
-    //   }
-    // },
-    // {
     //   "path": "pages/reward/detail",
     //   "style": {
     //     "navigationBarTitleText": "一番赏",

src/pages/help/help_about.vue → src/pages/help/about.vue

@@ -12,10 +12,7 @@
 
 <script>
 export default {
-  data() {
-    return {};
-  },
-  methods: {},
+  name: "HelpAbout",
 };
 </script>
 

src/pages/help/contact.vue

@@ -0,0 +1,30 @@
+<template>
+  <view class="content">
+    <view class="p">联系人：</view>
+    <view class="p">邮箱：</view>
+    <view class="p">电话：</view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "HelpContact",
+  data() {
+    return {};
+  },
+  methods: {},
+};
+</script>
+
+<style>
+.content {
+}
+
+.p {
+  color: #666;
+  font-size: 28rpx;
+  line-height: 42rpx;
+  text-indent: 22px;
+  margin: 16rpx 32rpx;
+}
+</style>

src/pages/help/help.vue

@@ -19,7 +19,7 @@
     </view>
     <view>
       <view class="title">帮助</view>
-      <view class="option" @tap="openDetail('user')">
+      <view class="option" @tap="openDetail('service')">
         <view class="option-list">
           <view class="option-list_text">用户服务协议</view>
           <view class="option-list_img1">
@@ -27,6 +27,22 @@
           </view>
         </view>
       </view>
+      <view class="option" @tap="openDetail('contact')">
+        <view class="option-list">
+          <view class="option-list_text">商务合作</view>
+          <view class="option-list_img1">
+            <image mode :src="require('@/assets/my/icon-more.png')"></image>
+          </view>
+        </view>
+      </view>
+      <!-- <view class="option" @tap="openDetail('rule')">
+        <view class="option-list">
+          <view class="option-list_text">余额服务须知</view>
+          <view class="option-list_img1">
+            <image mode :src="require('@/assets/my/icon-more.png')"></image>
+          </view>
+        </view>
+      </view> -->
       <!-- <view class="option" @tap="openDetail('rule')">
         <view class="option-list">
           <view class="option-list_text">余额服务须知</view>
@@ -35,14 +51,14 @@
           </view>
         </view>
       </view> -->
-      <view class="option" @tap="openDetail('about')">
+      <!-- <view class="option" @tap="openDetail('about')">
         <view class="option-list">
           <view class="option-list_text">关于我们</view>
           <view class="option-list_img1">
             <image mode :src="require('@/assets/my/icon-more.png')"></image>
           </view>
         </view>
-      </view>
+      </view> -->
     </view>
   </view>
 </template>
@@ -57,9 +73,9 @@ export default {
   },
 
   methods: {
-    openDetail(index) {
+    openDetail(page) {
       uni.navigateTo({
-        url: "./help_" + index,
+        url: "./" + page,
       });
     },
   },

src/pages/help/help_contact.vue

@@ -1,80 +0,0 @@
-<template>
-  <view class="content">
-    <view class="top1"
-      >小初客服会周一到周五10点至18点为您提供在线服务，周末也会不定期上线喽~如遇到繁忙请不要着急，留下您的问题我们会第一时间回复您哦~</view
-    >
-    <view class="top1"
-      >【截图保存下面图片，请使用微信扫码，即可添加专属客服哦~】</view
-    >
-    <image
-      src="@/assets/service.jpg"
-      class="img2"
-      mode="widthFix"
-      :show-menu-by-longpress="true"
-    ></image>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {};
-  },
-  methods: {},
-};
-</script>
-
-<style>
-image {
-  height: inherit;
-  width: inherit;
-}
-
-.content {
-  align-items: flex-start;
-  display: flex;
-  flex-direction: column;
-  width: 750rpx;
-  min-height: 100vh;
-  box-sizing: border-box;
-  padding-bottom: 64rpx;
-}
-
-.top {
-  color: #333;
-  font-size: 30rpx;
-  line-height: 32rpx;
-  margin-top: 48rpx;
-}
-
-.top1,
-.top {
-  display: inline-block;
-  font-family: PingFangSC-Medium;
-  margin-left: 32rpx;
-  width: 686rpx;
-}
-
-.top1 {
-  color: #666;
-  font-size: 28rpx;
-  line-height: 42rpx;
-  margin-top: 16rpx;
-  text-indent: 22px;
-}
-
-.img {
-  background: #d8d8d8;
-  border-radius: 16rpx;
-  display: inline-block;
-  height: 291rpx;
-  margin-left: 32rpx;
-  margin-top: 24rpx;
-  width: 686rpx;
-}
-.img2 {
-  width: 50%;
-  display: block;
-  margin: 0 auto;
-}
-</style>

src/pages/help/help_rule.vue → src/pages/help/rule.vue

@@ -52,10 +52,7 @@
 
 <script>
 export default {
-  data() {
-    return {};
-  },
-  methods: {},
+  name: "HelpRule",
 };
 </script>
 

src/pages/help/help_user.vue → src/pages/help/service.vue

@@ -273,10 +273,7 @@
 
 <script>
 export default {
-  data() {
-    return {};
-  },
-  methods: {},
+  name: "HelpService",
 };
 </script>
 

src/pages/my/my.vue

@@ -33,16 +33,6 @@
           <view class="label">红包卡券</view>
         </view>
       </view>
-      <view class="my-balance-bar">
-        <view class="my-balance-text">
-          余额：&yen;<text class="big">{{
-            userInfo.show_price ? userInfo.show_price : "0.00"
-          }}</text>
-        </view>
-        <button class="my-balance-btn" @click="jump('./recharge')">
-          去充值
-        </button>
-      </view>
     </view>
     <view class="my-main">
       <view class="my-title">