jufubao-food 1.0.11 → 1.0.12-beta2

package/commands.js

@@ -61,7 +61,7 @@ const handleJsonPackage = require('./build/version/Json');
 
   if (isUpdate || isNodeModulesVersionUpdate) {
     //是否需要升级基础插件
-    let cmdStr = `npm i --registry=https://registry.npm.taobao.org && `;
+    let cmdStr = `npm i --registry=https://registry.npmmirror.com && `;
 
     //复制插件库文件
     cmdStr = `${cmdStr} cross-env oss=${is0ss} node ./build/commands/copy.init.js`;

package/commands.update.change.js

@@ -0,0 +1,176 @@
+'use strict';
+
+const path = require('path');
+const basePath = require('./build/path');
+const clog = require('./build/clog');
+const fileHelper = require('./build/fileHepler');
+const utils = require('./build/lib/utils');
+const execSync = require('child_process').execSync;
+
+///Users/shiyonggao/Desktop/code/BASE/UNIAPP/
+//业务项目ID
+// const projectPathList = [
+//   {
+//     name: '业务组件基础插件库',
+//     path: '/Users/shiyonggao/home/root/Base-Jufubao/jufubao-base'
+//   },
+//   {
+//     name: '业务组件商城库',
+//     path: '/Users/shiyonggao/home/root/Base-Jufubao/jufubao-mall'
+//   },
+//   {
+//     name: '业务组件在线选座库',
+//     path: '/Users/shiyonggao/home/root/Base-Jufubao/jufubao-movie'
+//   },
+//   {
+//     name: '业务组件核销库',
+//     path: '/Users/shiyonggao/home/root/Base-Jufubao/jufubao-cashier'
+//   },
+// ];
+
+//业务项目ID
+const projectPathList = [
+  {
+    name: '业务组件基础插件库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-base'
+  },
+  {
+    name: '业务组件商城库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-mall'
+  },
+  {
+    name: '业务组件在线选座库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-movie'
+  },
+  {
+    name: '业务组件核销库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-cashier'
+  },
+  {
+    name: '业务组件演出库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-play'
+  },
+  {
+    name: '业务组件礼包库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-gift'
+  },
+  {
+    name: '业务组件旅游库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-travel'
+  },
+  {
+    name: '业务组件餐饮库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-food'
+  },
+];
+
+
+
+//插件库版本
+function getLibraryVersion() {
+  let pathUrl = fileHelper.getPlatformSurePath(`${basePath.buildRoot}/package.json`);
+  let packagejson = require(pathUrl);
+  return packagejson.dependencies['gxd-uni-library-editx'];
+}
+
+//需要更新的文件
+const projectChange = [
+  //系统文件
+  // '/commands',
+  // '/build',
+  // "/src/mixins",
+  //
+  // //其他
+  // '/commands.js',
+  // "/src/common/request.js",
+  // "/schemas/card.js",
+
+];
+
+const init = () => {
+  let argv = utils.getArgv();
+  if (argv.length === 0) {
+    clog(`请传入参数，例如： npm run change copy(拷贝)|del(删除)`, 'red');
+    process.exit(-1);
+  }
+
+  if (argv[0] !== 'copy' && argv[0] !== 'del') {
+    clog(`参数错误，正确参数为：copy，del。例如： npm run change copy`, 'red');
+    process.exit(-1);
+  }
+
+  let type = argv[0];
+  let isLocal = argv[1] !== undefined;
+
+
+  //获取需要拷贝的项目路径
+  clog(`开始操作文件`, 'cyanBG');
+
+  //复制命令行
+  projectChange.map(file => {
+    let toPath = fileHelper.getPlatformSurePath(basePath.buildRoot + '/' + file);
+    projectPathList.map(item => {
+      let fromPath = fileHelper.getPlatformSurePath(item.path + '/' + file);
+      if (type === 'copy') {
+        if (file === '/commands' || file === '/build') {
+          if (fileHelper.existFileSync(fromPath)) {
+            fileHelper.removeFileAndDir(fromPath)
+          }
+        }
+        fileHelper.copySync(toPath, fromPath);
+        clog(`拷贝文件成功，目录:${fromPath}`, 'green');
+      }
+      if (type === 'del') {
+        fileHelper.removeFileAndDir(fromPath);
+        clog(`删除文件成功，目录:${fromPath}`, 'green');
+      }
+    });
+
+    //复制到打包服务器中
+    if (file === '/src/mixins') {
+      let templatePath = '/Users/shiyonggao/Desktop/code/JFB/package/ali-editx-templates.jufubao.cn';
+      if(fileHelper.existFileSync(templatePath)) {
+        let templateFromPath = fileHelper.getPlatformSurePath(templatePath + '/' + file);
+        fileHelper.copySync(toPath, templateFromPath);
+      }
+    }
+  });
+
+
+  //获取需要拷贝的项目路径
+  clog(`结束操作文件`, 'cyanBG');
+
+  if (type === 'del') return;
+
+  //更新版本
+  projectPathList.map(item => {
+    let pathUrl = fileHelper.getPlatformSurePath(`${item.path}/package.json`);
+    let packagejson = require(pathUrl);
+    let version = getLibraryVersion();
+    //切换目录
+    let cmdStr = `cd ${fileHelper.getPlatformSurePath(item.path)}`;
+    if (version !== packagejson.dependencies['gxd-uni-library-editx']) {
+      clog(`更新前版本：${packagejson.dependencies['gxd-uni-library-editx']}，更新后的版本:${version}`, 'cyan');
+
+
+      //安装版本
+      cmdStr = `${cmdStr} && npm run init false`;
+
+      //插件库拷贝命令
+      cmdStr = `${cmdStr} && npm run update`;
+      clog(cmdStr, 'cyan');
+      execSync(cmdStr, {stdio: 'inherit'});
+
+    } else {
+      //插件库拷贝命令
+      cmdStr = `${cmdStr} && cross-env oss=true isLocal=${isLocal} node ./build/commands/copy.init.js && npm run update`;
+      clog(cmdStr, 'cyan');
+      execSync(cmdStr, {stdio: 'inherit'});
+    }
+  });
+
+};
+
+init();
+
+

package/commands.update.js

@@ -0,0 +1,65 @@
+'use strict';
+
+const path = require('path');
+const basePath = require('./build/path');
+const clog = require('./build/clog');
+const fileHelper = require('./build/fileHepler');
+const utils = require('./build/lib/utils');
+const execSync = require('child_process').execSync;
+
+//业务项目ID
+const projectPathList = [
+  {
+    name: '业务组件基础插件库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-base'
+  },
+  {
+    name: '业务组件商城库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-mall'
+  },
+  {
+    name: '业务组件在线选座库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-movie'
+  },
+  {
+    name: '业务组件核销库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-cashier'
+  },
+  {
+    name: '业务组件演出库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-play'
+  },
+  {
+    name: '业务组件礼包库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-gift'
+  },
+  {
+    name: '业务组件旅游库',
+    path: '/Users/shiyonggao/Desktop/code/JFB/package/jufubao-travel'
+  },
+];
+
+
+const init = ()=>{
+  let argv = utils.getArgv();
+  if (argv.length === 0) {
+    clog(`请传入参数， 例如： node ./commands.update.js true`, 'red');
+    process.exit(-1);
+  }
+  let isLocal = argv[0] === 'true';
+
+  //更新版本
+  projectPathList.map(item => {
+    let cmdStr = `cd ${fileHelper.getPlatformSurePath(item.path)}`;
+    //切换目录
+    cmdStr = `${cmdStr} && npm i --registry=https://registry.npm.taobao.org`;
+    cmdStr = `${cmdStr} && cross-env oss=true isLocal=${isLocal} node ./build/commands/copy.init.js`;
+    clog(cmdStr, 'cyan');
+    execSync(cmdStr, {stdio: 'inherit'});
+    clog(`更新完成，路径：${fileHelper.getPlatformSurePath(item.path)}`, 'cyan');
+  });
+};
+
+init();
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-food",
-  "version": "1.0.11",
+  "version": "1.0.12-beta2",
   "private": false,
   "description": "聚福宝业务组件餐饮插件包",
   "main": "index.js",
@@ -15,8 +15,11 @@
     "release": "node ./commands/release.js",
     "view": "node ./commands/update.preview.js food",
     "replace": "node ./commands/vue.replce.js JfbFood",
+    "rename": "node ./commands/change.pack.js JfbBase JfbSms",
+    "copy.pack": "node ./commands/change.pack.js",
     "init": "node ./commands.js false",
     "init.local": "node ./commands.js true",
+    "init.change": "node ./commands.update.change.js",
     "coder": "node ./build/commands/coder.js",
     "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch",
     "dev:mp-weixin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch --minimize",
@@ -48,7 +51,7 @@
     "color": "^3.1.3",
     "core-js": "^2.6.5",
     "flyio": "^0.6.2",
-    "gxd-uni-library-editx": "1.0.8-beta45",
+    "gxd-uni-library-editx": "1.0.123",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
     "path-to-regexp": "^6.2.1",

package/src/components/JfbFoodBrand/JfbFoodBrand.vue

@@ -10,7 +10,9 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-food-brand__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-food-brand__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
     </view>
     <!-- #endif -->
     <view

package/src/components/JfbFoodBrand/JfbFoodBrandLess.less

@@ -33,7 +33,7 @@
       left:0;
       bottom:0;
       right:0;
-      z-index: 4;
+      z-index: var(--preview-z-index);
       cursor: pointer;
     }
 
@@ -44,17 +44,18 @@
     cursor: pointer;
     position: absolute;
     right: unit(0, rpx);
-    top: unit(-52, rpx);
+    top: unit(0, rpx);
     height: unit(50, rpx);
-    line-height: unit(50, rpx);
+    z-index: 100;
     display: flex;
     justify-content: center;
     align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
     box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
     color: #fff;
     font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
 
     &-icon{
       padding: 0 unit(20, rpx);

package/src/components/JfbFoodBrandV2/JfbFoodBrandV2.vue

@@ -10,7 +10,9 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-food-brand-v2__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-food-brand-v2__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
     </view>
     <!-- #endif -->
     <view class="jfb-food-brand-v2__body">

package/src/components/JfbFoodBrandV2/JfbFoodBrandV2Less.less

@@ -33,7 +33,7 @@
       left:0;
       bottom:0;
       right:0;
-      z-index: 4;
+      z-index: var(--preview-z-index);
       cursor: pointer;
     }
 
@@ -44,17 +44,18 @@
     cursor: pointer;
     position: absolute;
     right: unit(0, rpx);
-    top: unit(-52, rpx);
+    top: unit(0, rpx);
     height: unit(50, rpx);
-    line-height: unit(50, rpx);
+    z-index: 100;
     display: flex;
     justify-content: center;
     align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
     box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
     color: #fff;
     font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
 
     &-icon{
       padding: 0 unit(20, rpx);

package/src/components/JfbFoodConfirm/JfbFoodConfirm.vue

@@ -10,7 +10,9 @@
       :class="{ editx : isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-food-confirm__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-food-confirm__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
     </view>
     <!-- #endif -->
     <view class="jfb-food-confirm__body">

package/src/components/JfbFoodConfirm/JfbFoodConfirmLess.less

@@ -33,7 +33,7 @@
       left:0;
       bottom:0;
       right:0;
-      z-index: 4;
+      z-index: var(--preview-z-index);
       cursor: pointer;
     }
 
@@ -44,17 +44,18 @@
     cursor: pointer;
     position: absolute;
     right: unit(0, rpx);
-    top: unit(-52, rpx);
+    top: unit(0, rpx);
     height: unit(50, rpx);
-    line-height: unit(50, rpx);
+    z-index: 100;
     display: flex;
     justify-content: center;
     align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
     box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
     color: #fff;
     font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
 
     &-icon{
       padding: 0 unit(20, rpx);

package/src/components/JfbFoodConfirmV2/Api.js

@@ -0,0 +1,96 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Confirm
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: "getFoodCartConfirm",
+    title: "确认订单产品列表",
+    path: "/food/v1/order/confirm",
+    isRule: false,
+    data: {
+      namespace: ['namespace', 'String', true],
+      cart_order_id: ['cart_order_id', 'String', true],
+      address_nnid: ['收货地址', 'String', true],
+      delivery_method: ['投递方式', 'String', false],
+      blessings: ['祝福语', 'String', false],
+      subscribeTimeInfo: ['配送时间', 'String', false]
+    },
+    isConsole: true,
+    disabled: true
+  },
+  {
+    mapFnName: 'getFoodCardList',
+    title: '展示可选卡列表',
+    path: '/mall/v1/order/list-binded-cards',
+    isRule: false,
+    params: {},
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'foodSelectCard',
+    title: '选择卡',
+    path: '/mall/v1/order/use-binded-card',
+    isRule: false,
+    data: {
+      namespace: ['namespace', 'String', true],
+      selected_card_list_json: ['被操作的卡券的卡号', 'String', '必选'],
+      selected_wallet_list_json: ['钱包', 'String', '必选'],
+      card_number: ['选中的卡券编号', 'String', '必选'],
+      total_price: ['总金额', 'Number', '必选'],
+      cart_order_id: ['临时订单号', 'Number', '必选'],
+      select_content: ['次卡是否多扣，1 还没有选择 2 多扣一次 3 不多扣', 'Number', '必选']
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'addFoodCard',
+    title: '添加卡',
+    path: '/mall/v1/order/use-new-card',
+    isRule: false,
+    data: {
+      namespace: ['namespace', 'String', true],
+      selected_card_list_json: ['被操作的卡券的卡号', 'String', '必选'],
+      card_number: ['卡编号', 'String', '必选'],
+      card_password: ['卡密码', 'String', '必选'],
+      card_qrcode: ['卡二维码', 'String', '必选'],
+      total_price: ['总金额', 'Number', '必选'],
+      cart_order_id: ['临时订单号', 'String', '必选'],
+      valid_token: ['验证码token', 'String', '必选'],
+      valid_code: ['验证码正文', 'String', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+
+  {
+    mapFnName: "getUserWallet",
+    title: "订单支付-可用钱包列表",
+    path: "/pay/v1/wallet/list-user-available-wallet",
+    isRule: false,
+    params: {
+      support_method: ['元宝：wallet 积分: score', 'string', true],
+      business_code: ['业务线', 'string', true],
+      sub_business_codes: ['子业务线', 'string', true],
+    },
+    isConsole: true,
+    disabled: true
+  },
+  {
+    mapFnName: "useBindedWallet",
+    title: "使用已绑钱包",
+    path: "/mall/v1/order/use-binded-wallet",
+    isRule: false,
+    data: {
+      selected_card_list_json: ['卡', 'string', true],
+      selected_wallet_list_json: ['钱包', 'string', true],
+      total_price: ['总金额', 'string', true],
+    },
+    isConsole: true,
+    disabled: true
+  },
+];

package/src/components/JfbFoodConfirmV2/Attr.js

@@ -0,0 +1,20 @@
+'use strict';
+import style from "./cusAttr/style";
+import advanced from "./cusAttr/advanced";
+import content from "./cusAttr/content";
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  advanced: [],
+  content: (data, gValue, gColor, oldData={})=>{
+
+    return [
+      ...content(data, gValue,gColor,oldData),
+      ...style(data, gValue,gColor,oldData),
+      ...advanced(data),
+    ].filter(i=>i)
+  },
+};