mp：同步 mp 公众号 SQL

pom.xml

@@ -18,8 +18,8 @@
         <module>yudao-module-infra</module>
         <module>yudao-module-pay</module>
 <!--        <module>yudao-module-bpm</module>-->
-        <module>yudao-module-visualization</module>
-        <module>yudao-module-mp</module>
+<!--        <module>yudao-module-visualization</module>-->
+<!--        <module>yudao-module-mp</module>-->
         <!--        <module>yudao-module-mall</module>-->
         <!-- 示例项目 -->
         <module>yudao-example</module>

sql/optional/mall/coupon.sql

@@ -1,85 +0,0 @@
-DROP TABLE IF EXISTS `coupon`;
-CREATE TABLE `coupon`
-(
-    `id`                        bigint                                                         NOT NULL AUTO_INCREMENT COMMENT '用户ID',
-    `type`                      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci  NOT NULL COMMENT '优惠券类型 reward-满减 discount-折扣 random-随机',
-    `name`                      varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci   NOT NULL COMMENT '优惠券名称',
-    `coupon_type_id`            bigint UNSIGNED                                                         DEFAULT 0 COMMENT '优惠券类型id',
-    `coupon_code`               varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci  NOT NULL COMMENT '优惠券编码',
-    `member_id`                 bigint UNSIGNED                                                NOT NULL DEFAULT 0 COMMENT '领用人',
-    `use_order_id`              bigint UNSIGNED                                                NOT NULL DEFAULT 0 COMMENT '优惠券使用订单id',
-    `goods_type`                tinyint(1) UNSIGNED                                            NOT NULL DEFAULT 0 COMMENT '适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用',
-    `goods_ids`                 varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '适用商品id',
-    `at_least`                  decimal(10, 2) UNSIGNED                                        NOT NULL DEFAULT 0 COMMENT '最小金额',
-    `money`                     decimal(10, 2) UNSIGNED                                        NOT NULL DEFAULT 0 COMMENT '面额',
-    `discount`                  decimal(10, 2) UNSIGNED                                        NOT NULL DEFAULT 0 COMMENT '1 =< 折扣 <= 9.9 当type为discount时需要添加',
-    `discount_limit`            decimal(10, 2) UNSIGNED                                        NOT NULL DEFAULT 0 COMMENT '最多折扣金额 当type为discount时可选择性添加',
-    `whether_forbid_preference` tinyint(1) UNSIGNED                                            NOT NULL DEFAULT 0 COMMENT '优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用',
-    `whether_expire_notice`     tinyint(1) UNSIGNED                                            NOT NULL DEFAULT 0 COMMENT '是否开启过期提醒0-不开启 1-开启',
-    `expire_notice_fixed_term`  int(11) UNSIGNED                                               NOT NULL DEFAULT 0 COMMENT '过期前N天提醒',
-    `whether_noticed`           tinyint(1) UNSIGNED                                            NOT NULL DEFAULT 0 COMMENT '是否已提醒',
-    `state`                     tinyint(4) UNSIGNED                                            NOT NULL DEFAULT 0 COMMENT '优惠券状态 1已领用（未使用） 2已使用 3已过期',
-    `get_type`                  tinyint(1) UNSIGNED                                            NOT NULL DEFAULT 0 COMMENT '获取方式1订单2.直接领取3.活动领取 4转赠 5分享获取',
-    `fetch_time`                datetime                                                       NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '领取时间',
-    `use_time`                  datetime                                                       NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '使用时间',
-    `start_time`                datetime                                                       NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '可使用的开始时间',
-    `end_time`                  datetime                                                       NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '有效期结束时间',
-    `creator`                   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci   NULL     DEFAULT '' COMMENT '创建者',
-    `create_time`               datetime                                                       NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`                   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci   NULL     DEFAULT '' COMMENT '更新者',
-    `update_time`               datetime                                                       NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`                   bit(1)                                                         NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    `tenant_id`                 bigint                                                         NOT NULL DEFAULT 0 COMMENT '租户编号',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB
-  AUTO_INCREMENT = 119
-  CHARACTER SET = utf8mb4
-  COLLATE = utf8mb4_unicode_ci COMMENT = '优惠券';
-
-DROP TABLE IF EXISTS `coupon_templete`;
-CREATE TABLE `coupon_templete`
-(
-    `id`                        bigint                                                       NOT NULL AUTO_INCREMENT COMMENT '用户ID',
-    `type`                      varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '优惠券类型 reward-满减 discount-折扣 random-随机',
-    `name`                      varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '优惠券名称',
-    `coupon_name_remark`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '名称备注',
-    `image`                     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '优惠券图片',
-    `count`                     int(11)                                                      NOT NULL DEFAULT 0 COMMENT '发放数量',
-    `lead_count`                int(11)                                                      NOT NULL DEFAULT 0 COMMENT '已领取数量',
-    `used_count`                int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '已使用数量',
-    `goods_type`                tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 1 COMMENT '适用商品类型1-全部商品可用；2-指定商品可用；3-指定商品不可用',
-    `product_ids`               varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '适用商品id',
-    `has_use_limit`             tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '使用门槛0-无门槛 1-有门槛',
-    `at_least`                  decimal(10, 2)                                               NOT NULL DEFAULT 0 COMMENT '满多少元使用 0代表无限制',
-    `money`                     decimal(10, 2)                                               NOT NULL DEFAULT 0 COMMENT '发放面额 当type为reward时需要添加',
-    `discount`                  decimal(10, 2) UNSIGNED                                      NOT NULL DEFAULT 0 COMMENT '1 =< 折扣 <= 9.9 当type为discount时需要添加',
-    `discount_limit`            decimal(10, 2)                                               NOT NULL DEFAULT 0 COMMENT '最多折扣金额 当type为discount时可选择性添加',
-    `min_money`                 decimal(10, 2) UNSIGNED                                      NOT NULL DEFAULT 0 COMMENT '最低金额 当type为radom时需要添加',
-    `max_money`                 decimal(10, 2) UNSIGNED                                      NOT NULL DEFAULT 0 COMMENT '最大金额 当type为radom时需要添加',
-    `validity_type`             tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '过期类型1-时间范围过期 2-领取之日固定日期后过期 3-领取次日固定日期后过期',
-    `start_use_time`            datetime COMMENT '使用开始日期 过期类型1时必填',
-    `end_use_time`              datetime COMMENT '使用结束日期 过期类型1时必填',
-    `fixed_term`                int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '当validity_type为2或者3时需要添加 领取之日起或者次日N天内有效',
-    `whether_limitless`         tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '是否无限制0-否 1是',
-    `max_fetch`                 int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '每人最大领取个数',
-    `whether_expire_notice`     tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '是否开启过期提醒0-不开启 1-开启',
-    `expire_notice_fixed_term`  int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '过期前N天提醒',
-    `whether_forbid_preference` tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '优惠叠加 0-不限制 1- 优惠券仅原价购买商品时可用',
-    `whether_show`              int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '是否显示',
-    `discount_order_money`      decimal(10, 2) UNSIGNED                                      NOT NULL DEFAULT 0 COMMENT '订单的优惠总金额',
-    `order_money`               decimal(10, 2) UNSIGNED                                      NOT NULL DEFAULT 0 COMMENT '用券总成交额',
-    `whether_forbidden`         tinyint(1) UNSIGNED                                          NOT NULL DEFAULT 0 COMMENT '是否禁止发放0-否 1-是',
-    `order_goods_num`           int(11) UNSIGNED                                             NOT NULL DEFAULT 0 COMMENT '使用优惠券购买的商品数量',
-    `status`                    tinyint(11)                                                  NOT NULL DEFAULT 0 COMMENT '状态（1进行中2已结束-1已关闭）',
-    `end_time`                  datetime COMMENT '有效日期结束时间',
-    `creator`                   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL     DEFAULT '' COMMENT '创建者',
-    `create_time`               datetime                                                     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`                   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL     DEFAULT '' COMMENT '更新者',
-    `update_time`               datetime                                                     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`                   bit(1)                                                       NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    `tenant_id`                 bigint                                                       NOT NULL DEFAULT 0 COMMENT '租户编号',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB
-  AUTO_INCREMENT = 119
-  CHARACTER SET = utf8mb4
-  COLLATE = utf8mb4_unicode_ci COMMENT = '优惠券模板';

sql/optional/mall/order.sql

@@ -1,78 +0,0 @@
-/**todo cancelType 设置默认值 0?*/
-DROP TABLE IF EXISTS `trade_order`;
-CREATE TABLE `trade_order`
-(
-    `id`                      bigint          NOT NULL AUTO_INCREMENT COMMENT '用户ID',
-    `sn`                      varchar(32)     NOT NULL COMMENT '订单流水号',
-    `type`                    int             NOT NULL DEFAULT '0' COMMENT '订单类型：[0:普通订单 1:秒杀订单 2:拼团订单 3:砍价订单]',
-    `terminal`                int             NOT NULL COMMENT '订单来源终端：[1:小程序 2:H5 3:iOS 4:安卓]',
-    `user_id`                 bigint unsigned NOT NULL COMMENT '用户编号',
-    `user_ip`                 varchar(30)     NOT NULL DEFAULT '' COMMENT '用户 IP',
-    `user_remark`             varchar(200)             DEFAULT NULL COMMENT '用户备注',
-    `status`                  int             NOT NULL DEFAULT '0' COMMENT '订单状态：[0:待付款 1:待发货 2:待收货 3:已完成 4:已关闭]',
-    `product_count`           int             NOT NULL COMMENT '购买的商品数量',
-    `cancel_type`             int             DEFAULT NULL COMMENT '取消类型：[10:超时未支付 20:退款关闭 30:买家取消 40:已通过货到付款交易]',
-    `remark`                  varchar(200)             DEFAULT NULL COMMENT '商家备注',
-    `payed`                   bit(1)          NOT NULL DEFAULT b'0' COMMENT '是否已支付：[0:未支付 1:已经支付过]',
-    `pay_time`                datetime                 DEFAULT NULL COMMENT '订单支付时间',
-    `finish_time`             datetime                 DEFAULT NULL COMMENT '订单完成时间',
-    `cancel_time`             datetime                 DEFAULT NULL COMMENT '订单取消时间',
-    `sku_original_price`      int             NOT NULL DEFAULT '0' COMMENT '商品原价（总），单位：分',
-    `sku_promotion_price`     int             NOT NULL DEFAULT '0' COMMENT '商品优惠（总），单位：分',
-    `order_promotion_price`   int             NOT NULL DEFAULT '0' COMMENT '订单优惠（总），单位：分',
-    `delivery_price`          int             NOT NULL DEFAULT '0' COMMENT '运费金额，单位：分',
-    `pay_price`               int             NOT NULL DEFAULT '0' COMMENT '应付金额（总），单位：分',
-    `pay_order_id`            int             DEFAULT NULL COMMENT '支付订单编号',
-    `pay_channel`             int             DEFAULT NULL COMMENT '支付成功的支付渠道',
-    `delivery_type`           int             DEFAULT NULL DEFAULT '1' COMMENT '配送方式:[1:快递发货 2:自提]',
-    `actual_delivery_type`    int             DEFAULT NULL DEFAULT '1' COMMENT '实际的配送方式:[1:快递发货 2:自提]',
-    `delivery_template_id`     int                      DEFAULT NULL COMMENT '配置模板的编号',
-    `express_no`              int                      DEFAULT NULL COMMENT '物流公司单号',
-    `delivery_status`         bit(1)          NOT NULL DEFAULT b'0' COMMENT '发货状态[0:未发货 1:已发货]',
-    `delivery_time`           datetime                 DEFAULT NULL COMMENT '发货时间',
-    `receive_time`            datetime                 DEFAULT NULL COMMENT '收货时间',
-    `receiver_name`           varchar(20)     NOT NULL COMMENT '收件人名称',
-    `receiver_mobile`         varchar(20)     NOT NULL COMMENT '收件人手机',
-    `receiver_area_id`        int             NOT NULL COMMENT '收件人地区编号',
-    `receiver_post_code`      int                      DEFAULT NULL COMMENT '收件人邮编',
-    `receiver_detail_address` varchar(255)    NOT NULL COMMENT '收件人详细地址',
-    `refund_status`           int             NOT NULL DEFAULT '0' COMMENT '订单状态：[0:未退款 1:部分退款 2:全部退款]',
-    `refund_price`            int             NOT NULL DEFAULT '0' COMMENT '退款金额，单位：分',
-    `coupon_id`               bigint unsigned NOT NULL COMMENT '优惠劵编号',
-    `creator`                 varchar(64)              DEFAULT '' COMMENT '创建者',
-    `create_time`             datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`                 varchar(64)              DEFAULT '' COMMENT '更新者',
-    `update_time`             datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`                 bit(1)          NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB COMMENT ='交易订单表';
-
-
-DROP TABLE IF EXISTS `trade_order_item`;
-CREATE TABLE `trade_order_item`
-(
-    `id`                    bigint          NOT NULL AUTO_INCREMENT COMMENT '用户ID',
-    `user_id`               bigint unsigned NOT NULL COMMENT '用户编号',
-    `order_Id`              bigint unsigned NOT NULL COMMENT '订单编号',
-    `spu_id`                bigint unsigned NOT NULL COMMENT '商品 SPU 编号',
-    `sku_id`                bigint unsigned NOT NULL COMMENT '商品 SKU 编号',
-    `properties`            json                     DEFAULT NULL COMMENT '规格值数组，JSON 格式',
-    `name`                  varchar(128)    NOT NULL DEFAULT '' COMMENT '商品名称',
-    `pic_url`               varchar(200)             DEFAULT NULL COMMENT '商品图片',
-    `count`                 int             NOT NULL COMMENT '购买数量',
-    `commented`             bit(1)          NOT NULL DEFAULT b'0' COMMENT '是否评论：[0:未评论 1:已评论]',
-    `original_price`        int             NOT NULL DEFAULT '0' COMMENT '商品原价（单），单位：分',
-    `total_original_price`  int             NOT NULL DEFAULT '0' COMMENT '商品原价（总），单位：分',
-    `total_promotion_price` int             NOT NULL DEFAULT '0' COMMENT '商品级优惠（总），单位：分',
-    `present_price`         int             NOT NULL DEFAULT '0' COMMENT '最终购买金额（单），单位：分。',
-    `total_present_price`   int             NOT NULL DEFAULT '0' COMMENT '最终购买金额（总），单位：分。',
-    `total_pay_price`       int             NOT NULL DEFAULT '0' COMMENT '应付金额（总），单位：分',
-    `refund_status`         int             NOT NULL DEFAULT '0' COMMENT '退款状态:[0:未申请退款 1:申请退款 2:等待退款 3:退款成功]',
-    `refund_total`          int             NOT NULL DEFAULT '0' COMMENT '退款总金额，单位：分',
-    `creator`               varchar(64)              DEFAULT '' COMMENT '创建者',
-    `create_time`           datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updater`               varchar(64)              DEFAULT '' COMMENT '更新者',
-    `update_time`           datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`               bit(1)          NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB COMMENT ='交易订单明细表';

yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/convert/message/MpMessageConvert.java

@@ -57,14 +57,10 @@ public interface MpMessageConvert {
                 break;
             case WxConsts.XmlMsgType.IMAGE: // 2. 图片
             case WxConsts.XmlMsgType.VOICE: // 3. 语音
-                message.setMediaId(sendReqBO.getMediaId())
-//                        .setMediaUrl(sendReqBO.getMediaUrl()) TODO 芋艿：去 url
-                ;
+                message.setMediaId(sendReqBO.getMediaId());
                 break;
             case WxConsts.XmlMsgType.VIDEO: // 4. 视频
                 message.setMediaId(sendReqBO.getMediaId())
-//                        .setMediaUrl(sendReqBO.getMediaUrl()) TODO 芋艿：去 url
-
                         .setTitle(sendReqBO.getTitle()).setDescription(sendReqBO.getDescription());
                 break;
             case WxConsts.XmlMsgType.NEWS: // 5. 图文
@@ -73,7 +69,6 @@ public interface MpMessageConvert {
                 message.setTitle(sendReqBO.getTitle()).setDescription(sendReqBO.getDescription())
                         .setMusicUrl(sendReqBO.getMusicUrl()).setHqMusicUrl(sendReqBO.getHqMusicUrl())
                         .setThumbMediaId(sendReqBO.getThumbMediaId());
-//                        .setThumbMediaUrl(sendReqBO.getThumbMediaUrl()); TODO 芋艿：去 url
                 break;
             default:
                 throw new IllegalArgumentException("不支持的消息类型：" + message.getType());

yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/bo/MpMessageSendOutReqBO.java

@@ -56,14 +56,6 @@ public class MpMessageSendOutReqBO {
      */
     @NotEmpty(message = "消息 mediaId 不能为空", groups = {ImageMessageGroup.class, VoiceMessageGroup.class, VideoMessageGroup.class})
     private String mediaId;
-//    // TODO 芋艿：考虑去掉
-//    /**
-//     * 媒体 URL
-//     *
-//     * 消息类型为 {@link WxConsts.XmlMsgType} 的 IMAGE、VOICE、VIDEO
-//     */
-//    @NotEmpty(message = "消息内容不能为空", groups = {ImageMessageGroup.class, VoiceMessageGroup.class, VideoMessageGroup.class})
-//    private String mediaUrl;
 
     /**
      * 缩略图的媒体 id

yudao-server/pom.xml

@@ -59,12 +59,13 @@
             <artifactId>yudao-module-pay-biz</artifactId>
             <version>${revision}</version>
         </dependency>
-        <!-- 微信公众号 -->
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-mp-biz</artifactId>
-            <version>${revision}</version>
-        </dependency>
+
+        <!-- 微信公众号模块。默认注释，保证编译速度 -->
+<!--        <dependency>-->
+<!--            <groupId>cn.iocoder.boot</groupId>-->
+<!--            <artifactId>yudao-module-mp-biz</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
 
         <!-- 商城相关模块。默认注释，保证编译速度 -->
 <!--        <dependency>-->

yudao-ui-admin/src/views/mp/components/wx-location/main.vue

@@ -11,26 +11,26 @@
 </template>
 
 <script>
-  export default {
-    name: "wxLocation",
-    props: {
-      locationX: {
-        required: true,
-        type: Number
-      },
-      locationY: {
-        required: true,
-        type: Number
-      },
-      label: { // 地名
-        required: true,
-        type: String
-      },
-      qqMapKey: { // QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
-        required: false,
-        type: String,
-        default: 'TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E' // 需要自定义
-      }
+export default {
+  name: "wxLocation",
+  props: {
+    locationX: {
+      required: true,
+      type: Number
+    },
+    locationY: {
+      required: true,
+      type: Number
+    },
+    label: { // 地名
+      required: true,
+      type: String
+    },
+    qqMapKey: { // QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
+      required: false,
+      type: String,
+      default: 'TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E' // 需要自定义
     }
-  };
+  }
+};
 </script>

yudao-ui-admin/src/views/mp/components/wx-material-select/main.vue

@@ -95,153 +95,153 @@
 </template>
 
 <script>
-  import WxNews from '@/views/mp/components/wx-news/main.vue';
-  import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue';
-  import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue';
-  import { getMaterialPage } from "@/api/mp/material";
-  import { getFreePublishPage } from "@/api/mp/freePublish";
-  import { getDraftPage } from "@/api/mp/draft";
+import WxNews from '@/views/mp/components/wx-news/main.vue';
+import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue';
+import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue';
+import { getMaterialPage } from "@/api/mp/material";
+import { getFreePublishPage } from "@/api/mp/freePublish";
+import { getDraftPage } from "@/api/mp/draft";
 
-  export default {
-    name: "wxMaterialSelect",
-    components: {
-      WxNews,
-      WxVoicePlayer,
-      WxVideoPlayer
+export default {
+  name: "wxMaterialSelect",
+  components: {
+    WxNews,
+    WxVoicePlayer,
+    WxVideoPlayer
+  },
+  props: {
+    objData: {
+      type: Object, // type - 类型；accountId - 公众号账号编号
+      required: true
     },
-    props: {
-      objData: {
-        type: Object, // type - 类型；accountId - 公众号账号编号
-        required: true
-      },
-      newsType:{ // 图文类型：1、已发布图文；2、草稿箱图文
-        type: String,
-        default: "1"
+    newsType:{ // 图文类型：1、已发布图文；2、草稿箱图文
+      type: String,
+      default: "1"
+    },
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 总条数
+      total: 0,
+      // 数据列表
+      list: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        accountId: this.objData.accountId,
       },
+    }
+  },
+  created() {
+    this.getPage()
+  },
+  methods:{
+    selectMaterial(item) {
+      this.$emit('selectMaterial', item)
     },
-    data() {
-      return {
-        // 遮罩层
-        loading: false,
-        // 总条数
-        total: 0,
-        // 数据列表
-        list: [],
-        // 查询参数
-        queryParams: {
-          pageNo: 1,
-          pageSize: 10,
-          accountId: this.objData.accountId,
-        },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1
+      this.getPage()
+    },
+    getPage() {
+      this.loading = true
+      if (this.objData.type === 'news' && this.newsType === '1') { // 【图文】+ 【已发布】
+        this.getFreePublishPage();
+      } else if (this.objData.type === 'news' && this.newsType === '2') { // 【图文】+ 【草稿】
+        this.getDraftPage();
+      } else { // 【素材】
+        this.getMaterialPage();
       }
     },
-    created() {
-      this.getPage()
+    getMaterialPage() {
+      getMaterialPage({
+        ...this.queryParams,
+        type: this.objData.type
+      }).then(response => {
+        this.list = response.data.list
+        this.total = response.data.total
+      }).finally(() => {
+        this.loading = false
+      })
     },
-    methods:{
-      selectMaterial(item) {
-        this.$emit('selectMaterial', item)
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNo = 1
-        this.getPage()
-      },
-      getPage() {
-        this.loading = true
-        if (this.objData.type === 'news' && this.newsType === '1') { // 【图文】+ 【已发布】
-          this.getFreePublishPage();
-        } else if (this.objData.type === 'news' && this.newsType === '2') { // 【图文】+ 【草稿】
-          this.getDraftPage();
-        } else { // 【素材】
-          this.getMaterialPage();
-        }
-      },
-      getMaterialPage() {
-        getMaterialPage({
-          ...this.queryParams,
-          type: this.objData.type
-        }).then(response => {
-          this.list = response.data.list
-          this.total = response.data.total
-        }).finally(() => {
-          this.loading = false
-        })
-      },
-      getFreePublishPage() {
-        getFreePublishPage(this.queryParams).then(response => {
-          // 将 thumbUrl 转成 picUrl，保证 wx-news 组件可以预览封面
-          response.data.list.forEach(item => {
-            const newsItem = item.content.newsItem;
-            newsItem.forEach(article => {
-              article.picUrl = article.thumbUrl;
-            })
+    getFreePublishPage() {
+      getFreePublishPage(this.queryParams).then(response => {
+        // 将 thumbUrl 转成 picUrl，保证 wx-news 组件可以预览封面
+        response.data.list.forEach(item => {
+          const newsItem = item.content.newsItem;
+          newsItem.forEach(article => {
+            article.picUrl = article.thumbUrl;
           })
-          this.list = response.data.list
-          this.total = response.data.total
-        }).finally(() => {
-          this.loading = false
         })
-      },
-      getDraftPage() {
-        getDraftPage((this.queryParams)).then(response => {
-          // 将 thumbUrl 转成 picUrl，保证 wx-news 组件可以预览封面
-          response.data.list.forEach(item => {
-            const newsItem = item.content.newsItem;
-            newsItem.forEach(article => {
-              article.picUrl = article.thumbUrl;
-            })
+        this.list = response.data.list
+        this.total = response.data.total
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    getDraftPage() {
+      getDraftPage((this.queryParams)).then(response => {
+        // 将 thumbUrl 转成 picUrl，保证 wx-news 组件可以预览封面
+        response.data.list.forEach(item => {
+          const newsItem = item.content.newsItem;
+          newsItem.forEach(article => {
+            article.picUrl = article.thumbUrl;
           })
-          this.list = response.data.list
-          this.total = response.data.total
-        }).finally(() => {
-          this.loading = false
         })
-      }
+        this.list = response.data.list
+        this.total = response.data.total
+      }).finally(() => {
+        this.loading = false
+      })
     }
-  };
+  }
+};
 </script>
 
 <style lang="scss" scoped>
-  /*瀑布流样式*/
+/*瀑布流样式*/
+.waterfall {
+  width: 100%;
+  column-gap:10px;
+  column-count: 5;
+  margin: 0 auto;
+}
+.waterfall-item {
+  padding: 10px;
+  margin-bottom: 10px;
+  break-inside: avoid;
+  border: 1px solid #eaeaea;
+}
+.material-img {
+  width: 100%;
+}
+p {
+  line-height: 30px;
+}
+@media (min-width: 992px) and (max-width: 1300px) {
   .waterfall {
-    width: 100%;
-    column-gap:10px;
-    column-count: 5;
-    margin: 0 auto;
-  }
-  .waterfall-item {
-    padding: 10px;
-    margin-bottom: 10px;
-    break-inside: avoid;
-    border: 1px solid #eaeaea;
-  }
-  .material-img {
-    width: 100%;
+    column-count: 3;
   }
   p {
-    line-height: 30px;
+    color:red;
   }
-  @media (min-width: 992px) and (max-width: 1300px) {
-    .waterfall {
-      column-count: 3;
-    }
-    p {
-      color:red;
-    }
+}
+@media (min-width: 768px) and (max-width: 991px) {
+  .waterfall {
+    column-count: 2;
   }
-  @media (min-width: 768px) and (max-width: 991px) {
-    .waterfall {
-      column-count: 2;
-    }
-    p {
-      color: orange;
-    }
+  p {
+    color: orange;
   }
-  @media (max-width: 767px) {
-    .waterfall {
-      column-count: 1;
-    }
+}
+@media (max-width: 767px) {
+  .waterfall {
+    column-count: 1;
   }
-  /*瀑布流样式*/
+}
+/*瀑布流样式*/
 </style>

yudao-ui-admin/src/views/mp/components/wx-msg/main.vue

@@ -112,156 +112,156 @@ import { getMessagePage, sendMessage } from '@/api/mp/message'
   import WxMusic from '@/views/mp/components/wx-music/main.vue';
 import { getUser } from "@/api/mp/user";
 
-  export default {
-    name: "wxMsg",
-    components: {
-      WxReplySelect,
-      WxVideoPlayer,
-      WxVoicePlayer,
-      WxNews,
-      WxLocation,
-      WxMusic
+export default {
+  name: "wxMsg",
+  components: {
+    WxReplySelect,
+    WxVideoPlayer,
+    WxVoicePlayer,
+    WxNews,
+    WxLocation,
+    WxMusic
+  },
+  props: {
+    userId: {
+      type: Number,
+      required: true
     },
-    props: {
-      userId: {
-        type: Number,
-        required: true
+  },
+  data() {
+    return {
+      nowStr: new Date().getTime(), // 当前的时间戳，用于每次消息加载后，回到原位置；具体见 :id="'msg-div' + nowStr" 处
+      loading: false, // 消息列表是否正在加载中
+      loadMore: true, // 是否可以加载更多
+      list: [], // 消息列表
+      queryParams: {
+        pageNo: 1, // 当前页数
+        pageSize: 14, // 每页显示多少条
+        accountId: undefined,
       },
-    },
-    data() {
-      return {
-        nowStr: new Date().getTime(), // 当前的时间戳，用于每次消息加载后，回到原位置；具体见 :id="'msg-div' + nowStr" 处
-        loading: false, // 消息列表是否正在加载中
-        loadMore: true, // 是否可以加载更多
-        list: [], // 消息列表
-        queryParams: {
-          pageNo: 1, // 当前页数
-          pageSize: 14, // 每页显示多少条
-          accountId: undefined,
-        },
-        user: { // 由于微信不再提供昵称，直接使用“用户”展示
-          nickname: '用户',
-          avatar: require("@/assets/images/profile.jpg"),
-          accountId: 0, // 公众号账号编号
-        },
-        mp: {
-          nickname: '公众号',
-          avatar: require("@/assets/images/wechat.png"),
-        },
+      user: { // 由于微信不再提供昵称，直接使用“用户”展示
+        nickname: '用户',
+        avatar: require("@/assets/images/profile.jpg"),
+        accountId: 0, // 公众号账号编号
+      },
+      mp: {
+        nickname: '公众号',
+        avatar: require("@/assets/images/wechat.png"),
+      },
+
+      // ========= 消息发送 =========
+      sendLoading: false, // 发送消息是否加载中
+      objData: { // 微信发送消息
+        type: 'text',
+      },
+    }
+  },
+  created() {
+    // 获得用户信息
+    getUser(this.userId).then(response => {
+      this.user.nickname = response.data.nickname && response.data.nickname.length > 0 ?
+          response.data.nickname : this.user.nickname;
+      this.user.avatar = response.data.avatar && this.user.avatar.length > 0 ?
+          response.data.avatar : this.user.avatar;
+      this.user.accountId = response.data.accountId;
+      // 设置公众号账号编号
+      this.queryParams.accountId = response.data.accountId;
+      this.objData.accountId = response.data.accountId;
 
-        // ========= 消息发送 =========
-        sendLoading: false, // 发送消息是否加载中
-        objData: { // 微信发送消息
-          type: 'text',
-        },
+      // 加载消息
+      console.log(this.queryParams)
+      this.refreshChange()
+    })
+  },
+  methods:{
+    sendMsg(){
+      if (!this.objData) {
+        return;
+      }
+      // 公众号限制：客服消息，公众号只允许发送一条
+      if (this.objData.type === 'news'
+        && this.objData.articles.length > 1) {
+        this.objData.articles = [this.objData.articles[0]]
+        this.$message({
+          showClose: true,
+          message: '图文消息条数限制在 1 条以内，已默认发送第一条',
+          type: 'success'
+        })
       }
-    },
-    created() {
-      // 获得用户信息
-      getUser(this.userId).then(response => {
-        this.user.nickname = response.data.nickname && response.data.nickname.length > 0 ?
-            response.data.nickname : this.user.nickname;
-        this.user.avatar = response.data.avatar && this.user.avatar.length > 0 ?
-            response.data.avatar : this.user.avatar;
-        this.user.accountId = response.data.accountId;
-        // 设置公众号账号编号
-        this.queryParams.accountId = response.data.accountId;
-        this.objData.accountId = response.data.accountId;
 
-        // 加载消息
-        console.log(this.queryParams)
-        this.refreshChange()
+      // 执行发送
+      this.sendLoading = true
+      sendMessage(Object.assign({
+        userId: this.userId
+      }, {
+        ...this.objData
+      })).then(response => {
+        this.sendLoading = false
+        // 添加到消息列表，并滚动
+        this.list = [...this.list , ...[response.data] ]
+        this.scrollToBottom()
+        // 重置 objData 状态
+        this.$refs['replySelect'].deleteObj(); // 重置，避免 tab 的数据未清理
+      }).catch(() => {
+        this.sendLoading = false
       })
     },
-    methods:{
-      sendMsg(){
-        if (!this.objData) {
-          return;
+    loadingMore() {
+      this.queryParams.pageNo++
+      this.getPage(this.queryParams)
+    },
+    getPage(page, params) {
+      this.loading = true
+      getMessagePage(Object.assign({
+        pageNo: page.pageNo,
+        pageSize: page.pageSize,
+        userId: this.userId,
+        accountId: page.accountId,
+      }, params)).then(response => {
+        // 计算当前的滚动高度
+        const msgDiv = document.getElementById('msg-div' + this.nowStr);
+        let scrollHeight = 0
+        if(msgDiv){
+          scrollHeight = msgDiv.scrollHeight
         }
-        // 公众号限制：客服消息，公众号只允许发送一条
-        if (this.objData.type === 'news'
-          && this.objData.articles.length > 1) {
-          this.objData.articles = [this.objData.articles[0]]
-          this.$message({
-            showClose: true,
-            message: '图文消息条数限制在 1 条以内，已默认发送第一条',
-            type: 'success'
-          })
+
+        // 处理数据
+        const data = response.data.list.reverse();
+        this.list = [...data, ...this.list]
+        this.loading = false
+        if (data.length < this.queryParams.pageSize || data.length === 0){
+          this.loadMore = false
         }
+        this.queryParams.pageNo = page.pageNo
+        this.queryParams.pageSize = page.pageSize
 
-        // 执行发送
-        this.sendLoading = true
-        sendMessage(Object.assign({
-          userId: this.userId
-        }, {
-          ...this.objData
-        })).then(response => {
-          this.sendLoading = false
-          // 添加到消息列表，并滚动
-          this.list = [...this.list , ...[response.data] ]
+        // 滚动到原来的位置
+        if(this.queryParams.pageNo === 1) { // 定位到消息底部
           this.scrollToBottom()
-          // 重置 objData 状态
-          this.$refs['replySelect'].deleteObj(); // 重置，避免 tab 的数据未清理
-        }).catch(() => {
-          this.sendLoading = false
-        })
-      },
-      loadingMore() {
-        this.queryParams.pageNo++
-        this.getPage(this.queryParams)
-      },
-      getPage(page, params) {
-        this.loading = true
-        getMessagePage(Object.assign({
-          pageNo: page.pageNo,
-          pageSize: page.pageSize,
-          userId: this.userId,
-          accountId: page.accountId,
-        }, params)).then(response => {
-          // 计算当前的滚动高度
-          const msgDiv = document.getElementById('msg-div' + this.nowStr);
-          let scrollHeight = 0
-          if(msgDiv){
-            scrollHeight = msgDiv.scrollHeight
-          }
-
-          // 处理数据
-          const data = response.data.list.reverse();
-          this.list = [...data, ...this.list]
-          this.loading = false
-          if (data.length < this.queryParams.pageSize || data.length === 0){
-            this.loadMore = false
-          }
-          this.queryParams.pageNo = page.pageNo
-          this.queryParams.pageSize = page.pageSize
-
-          // 滚动到原来的位置
-          if(this.queryParams.pageNo === 1) { // 定位到消息底部
-            this.scrollToBottom()
-          } else if (data.length !== 0) { // 定位滚动条
-            this.$nextTick(() => {
-              if (scrollHeight !== 0){
-                msgDiv.scrollTop = document.getElementById('msg-div'+this.nowStr).scrollHeight - scrollHeight - 100
-              }
-            })
-          }
-        })
-      },
-      /**
-       * 刷新回调
-       */
-      refreshChange() {
-        this.getPage(this.queryParams)
-      },
-      /** 定位到消息底部 */
-      scrollToBottom: function () {
-        this.$nextTick(() => {
-          let div = document.getElementById('msg-div' + this.nowStr)
-          div.scrollTop = div.scrollHeight
-        })
-      },
-    }
-  };
+        } else if (data.length !== 0) { // 定位滚动条
+          this.$nextTick(() => {
+            if (scrollHeight !== 0){
+              msgDiv.scrollTop = document.getElementById('msg-div'+this.nowStr).scrollHeight - scrollHeight - 100
+            }
+          })
+        }
+      })
+    },
+    /**
+     * 刷新回调
+     */
+    refreshChange() {
+      this.getPage(this.queryParams)
+    },
+    /** 定位到消息底部 */
+    scrollToBottom: function () {
+      this.$nextTick(() => {
+        let div = document.getElementById('msg-div' + this.nowStr)
+        div.scrollTop = div.scrollHeight
+      })
+    },
+  }
+};
 </script>
 <style lang="scss" scoped>
 /* 因为 joolun 实现依赖 avue 组件，该页面使用了 comment.scss、card.scc  */

yudao-ui-admin/src/views/mp/components/wx-news/main.vue

@@ -35,17 +35,17 @@
 </template>
 
 <script>
-  export default {
-    name: "wxNews",
-    props: {
-      articles: {
-        type: Array // title - 标题；description - 描述；picUrl - 图片连接；url - 跳转链接
-      }
-    },
-    // created() {
-    //   console.log(this.articles)
-    // },
-  };
+export default {
+  name: "wxNews",
+  props: {
+    articles: {
+      type: Array // title - 标题；description - 描述；picUrl - 图片连接；url - 跳转链接
+    }
+  },
+  // created() {
+  //   console.log(this.articles)
+  // },
+};
 </script>
 
 <style lang="scss" scoped>