营销奖品内定、分销开关控制条目显隐

admin/.env.dev

@@ -5,5 +5,5 @@ VUE_APP_ENV='dev'
 VUE_APP_TITLE=万兴
 
 # 接口请求地址
-VUE_APP_API_URL='http://demo.standard.hdlkeji.com/adminapi'
+VUE_APP_API_URL='https://wanxingzhenxuan.com/adminapi'
 # VUE_APP_API_URL=''

admin/.gitignore

@@ -1,5 +1,13 @@
+# uniapp
+/unpackage
+
+# Node.js
 /node_modules
+
 .idea
+
 dist
+
 .hbuilderx
+
 *.zip

admin/package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "serve": "vue-cli-service serve --open --mode=dev",
     "dev": "vue-cli-service serve --open --mode=dev",
+    "fix-memory-limit": "cross-env LIMIT=10240 increase-memory-limit",
     "build": "vue-cli-service build --mode=production",
     "eslint:comment": "使用 ESLint 检查并自动修复 src 目录下所有扩展名为 .js 和 .vue 的文件",
     "eslint": "eslint --ext .js,.vue,.ts --ignore-path .gitignore --fix src",
@@ -107,7 +108,7 @@
     "mockjs": "^1.0.1-beta3",
     "node-sass": "^4.14.1",
     "prettier": "^2.5.1",
-    "sass-loader": "^10.1.0",
+    "sass-loader": "^7.3.0",
     "script-loader": "^0.7.2",
     "style-loader": "^1.2.1",
     "stylus-loader": "^3.0.2",

admin/src/pages/marketing/lottery/addGoods.vue

@@ -90,6 +90,15 @@
       <FormItem label="提示语" prop="prompt">
         <Input v-model="formValidate.prompt" :maxlength="15" placeholder="请输入提示语" style="width: 300px"></Input>
       </FormItem>
+      <FormItem label="是否内定用户" prop="is_appoint" v-if="formValidate.type!=1">
+        <RadioGroup v-model="formValidate.is_appoint">
+          <Radio :label="1">是</Radio>
+          <Radio :label="0">否</Radio>
+        </RadioGroup>
+      </FormItem>
+      <FormItem label="内定用户" prop="appoint_user" v-if="formValidate.type!=1&&formValidate.is_appoint==1">
+        <Input v-model="formValidate.appoint_user" :maxlength="30" placeholder="请输入用户(多个用户请用英文逗号隔开)" style="width: 300px" />
+      </FormItem>
       <FormItem>
         <Button type="primary" @click="handleSubmit('formValidate')">提交</Button>
       </FormItem>
@@ -160,6 +169,8 @@ export default {
         prompt: '', //提示语
         goods_image: '', //自用商品图
         coupon_title: '', //优惠券名称
+        is_appoint:1,//是否内定用户
+        appoint_user:'', //指定的用户
       },
       ruleValidate: {
         name: [
@@ -221,6 +232,7 @@ export default {
   },
   mounted() {
     let keys = Object.keys(this.editData);
+    console.log(this.editData);
     keys.forEach((item) => {
       this.formValidate[item] = this.editData[item];
       if (item === 'coupon_title' && this.editData[item]) {

wanxinguni-app/.gitignore

@@ -1,5 +1,5 @@
-/unpackage
-/node_modules
+unpackage/
+node_modules/
 
 .idea