代码合并

src/utils/httpRequest.js

@@ -14,8 +14,10 @@ const http = axios.create({
 })
 
 // const requestURl = "http://localhost:8100/czg/";
-const requestURl = "https://web-api.hnsiyao.cn/czg/";//测试
+// const requestURl = "https://web-api.hnsiyao.cn/czg/";//测试
 // const requestURl = "https://web.hnsiyao.cn/czg/";//正式
+// const requestURl = "http://192.168.1.31:8080/admin/";//php本地
+const requestURl = "https://playlet.test.sxczgkj.com/admin/";//php测试服
 
 /**
  * 请求拦截
@@ -38,6 +40,7 @@ http.interceptors.response.use(response => {
   }
   return response
 }, error => {
+	console.log(error)
   return Promise.reject(error)
 })
 

src/views/campus/campus.vue

@@ -2,9 +2,7 @@
   <div>
     <el-row>
       <div style="float: right">
-        <el-button size="mini" type="primary" icon="document" @click="refresh()"
-          >刷新</el-button
-        >
+        <el-button size="mini" type="primary" icon="document" @click="refresh()">刷新</el-button>
       </div>
       <el-col :span="24" class="cards">
         <div class="box">
@@ -17,10 +15,7 @@
                   style="color: red;"></i> -->
               </div>
               <div style="margin-top: 20px">
-                分享二维码：<img
-                  :src="h5erweimaImg"
-                  style="width: 100px; height: 100px"
-                />
+                分享二维码：<img :src="h5erweimaImg" style="width: 100px; height: 100px" />
               </div>
             </div>
             <!--
@@ -38,10 +33,7 @@
                 分享链接：<span>{{ xhxshareUrl }}</span>
               </div>
               <div style="margin-top: 20px">
-                分享二维码：<img
-                  :src="xcxerweimaImg"
-                  style="width: 100px; height: 100px"
-                />
+                分享二维码：<img :src="xcxerweimaImg" style="width: 100px; height: 100px" />
               </div>
             </div>
           </div>
@@ -56,10 +48,7 @@
                 分享链接：<span>{{ xhxshareUrl }}</span>
               </div>
               <div style="margin-top: 20px">
-                分享二维码：<img
-                  :src="dyxerweimaImg"
-                  style="width: 100px; height: 100px"
-                />
+                分享二维码：<img :src="dyxerweimaImg" style="width: 100px; height: 100px" />
               </div>
             </div>
           </div>
@@ -74,17 +63,13 @@
                 分享链接：<span>{{ appshareUrl }}</span>
               </div>
               <div style="margin-top: 20px">
-                分享海报：<img
-                  :src="posterImg"
-                  style="width: 120px; height: auto"
-                />
+                分享海报：<img :src="posterImg" style="width: 120px; height: auto" />
 
-                <el-button size="mini" type="primary" @click="imgDown(posterImg)"
-                  >海报下载
+                <el-button size="mini" type="primary" @click="imgDown(posterImg)">海报下载
                 </el-button>
               </div>
             </div>
-            
+
           </div>
         </div>
       </el-col>
@@ -92,26 +77,12 @@
     <!-- 添加社区 -->
     <el-dialog title="添加社区" :visible.sync="dialogFormVisible" center>
       <div style="margin-bottom: 10px">
-        <span style="width: 200px; display: inline-block; text-align: right"
-          >社区名称：</span
-        >
-        <el-input
-          style="width: 50%"
-          v-model="campusName"
-          type="text"
-          placeholder="请输入社区名称"
-        ></el-input>
+        <span style="width: 200px; display: inline-block; text-align: right">社区名称：</span>
+        <el-input style="width: 50%" v-model="campusName" type="text" placeholder="请输入社区名称"></el-input>
       </div>
       <div style="margin-bottom: 10px">
-        <span style="width: 200px; display: inline-block; text-align: right"
-          >社区地址：</span
-        >
-        <el-input
-          style="width: 50%"
-          v-model="campusDetails"
-          type="text"
-          placeholder="请输入社区地址"
-        ></el-input>
+        <span style="width: 200px; display: inline-block; text-align: right">社区地址：</span>
+        <el-input style="width: 50%" v-model="campusDetails" type="text" placeholder="请输入社区地址"></el-input>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -136,20 +107,17 @@
     <!-- 海报 -->
     <div>
       <!-- 海报html元素 -->
-      <div
-        id="posterHtml"
-        :style="{ backgroundImage: 'url(' + posterHtmlBg + ')' }"
-        style="
+      <div id="posterHtml" :style="{ backgroundImage: 'url(' + posterHtmlBg + ')' }" style="
           background-repeat: no-repeat;
           background-size: 1242px 2688px;
           width: 1242px;
           height: 2688px;
-        "
-        v-show="false"
-      >
+        " v-show="false">
         <div>{{ posterContent }}</div>
         <!-- 二维码 -->
-        <div><div id="qrcodeImg"></div></div>
+        <div>
+          <div id="qrcodeImg"></div>
+        </div>
       </div>
     </div>
   </div>
@@ -166,7 +134,7 @@ export default {
       posterContent: "", // 文案内容
       posterImg: "", // 最终生成的海报图片
       posterImgName: "宣传海报", // 最终生成的海报图片名称
-      posterHtmlBg: require("../../assets/img/poster.jpg"), // 背景图
+      posterHtmlBg: '', // 背景图
       showPoster: false,
       limit: 10,
       page: 1,
@@ -230,11 +198,11 @@ export default {
     },
     // 保存图片到本地
     imgDown(img) {
-      if(!this.posterImg){
+      if (!this.posterImg) {
         return this.$message({
-          titile:'提示',
-          message:'请先生成海报',
-          type:'warning'
+          titile: '提示',
+          message: '请先生成海报',
+          type: 'warning'
         })
       }
       var alink = document.createElement("a");
@@ -356,8 +324,8 @@ export default {
           var ids = id
             ? [id]
             : this.checkBoxData.map((item) => {
-                return item.campusId;
-              });
+              return item.campusId;
+            });
           this.$http({
             url: this.$http.adornUrl(`helpCampus/deleteCampus?ids=${ids}`),
             method: "get",
@@ -388,7 +356,7 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     //删除
     deleteStair(row) {
@@ -426,7 +394,7 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 重置
     cleans() {
@@ -499,12 +467,12 @@ export default {
             qdCode;
           this.appshareUrl =
             this.h5Url +
-            "/pages/login/registerApp?invitation=" +
+            "/pages/login/register?invitation=" +
             this.guanfangCode +
             "&qdCode=" +
             qdCode;
-            this.createQrcode( this.appshareUrl);
-            this.createPoster();
+          this.createQrcode(this.appshareUrl);
+          this.createPoster();
         }
       });
     },
@@ -523,24 +491,42 @@ export default {
         clipboard.destroy();
       });
     },
+    // 获取海报背景图
+    getPosterBg() {
+      this.$http({
+        url: this.$http.adornUrl("common/type/931"),
+        method: "get"
+      }).then(({ data }) => {
+        console.log(data);
+        if (data.code == 0) {
+          this.posterHtmlBg = data.data.value;
+        }
+
+        setTimeout(() => {
+          this.xianshi();
+        }, 500);
+      });
+    },
   },
   mounted() {
-    this.xianshi();
+    this.getPosterBg();
     // this.dataSelect()
   },
 };
 </script>
 
 <style scoped>
-#posterHtml{
+#posterHtml {
   position: relative;
 }
+
 #qrcodeImg {
   position: absolute;
   left: 50%;
-  transform: translateX(-50%);
-  bottom: 125px;
+  transform: translateX(-45%);
+  bottom: 150px;
 }
+
 .box {
   padding: 44px;
   border: 1px solid #eee;

src/views/campus/coupon.vue

@@ -56,7 +56,7 @@
 						</el-button> -->
 					</div>
 				</div>
-				
+
 				<el-table v-loading="tableDataLoadingKm" :data="tableDataKm.records" @selection-change="changeFunP" >
 					<el-table-column type="selection">
 					</el-table-column>
@@ -67,7 +67,7 @@
 					<el-table-column prop="sdkContent" label="卡密">
 					</el-table-column>
 					<el-table-column prop="sysUserName" label="渠道商名称">
-						
+
 					</el-table-column>
 					<el-table-column prop="giveNum" label="赠送会员天数">
 					</el-table-column>
@@ -121,7 +121,7 @@
 					<el-button type="primary" @click="amendNoticeTo()">确 定</el-button>
 				</div>
 			</el-dialog>
-			
+
 			<!-- 生成卡密 -->
 			<el-dialog title="生成卡密" :visible.sync="dialogFormVisible3" center width="70%">
 				<div style="margin-bottom: 10px;">
@@ -187,7 +187,7 @@
 					<el-table-column prop="sdkContent" label="卡密">
 					</el-table-column>
 					<el-table-column prop="sysUserName" label="渠道商名称">
-						
+
 					</el-table-column>
 					<el-table-column prop="giveNum" label="赠送会员天数" width="80">
 					</el-table-column>
@@ -236,7 +236,7 @@
 					</el-table-column>
 					<el-table-column prop="qdRate" header-align="center" align="center" label="渠道佣金">
 						<!-- <template slot-scope="scope">
-							<span  v-for="(item,index) in scope.row.roleEntityList" :key="index">{{item.roleName}} </span> 
+							<span  v-for="(item,index) in scope.row.roleEntityList" :key="index">{{item.roleName}} </span>
 						</template> -->
 					</el-table-column>
 					<el-table-column prop="qdCode" header-align="center" align="center" label="渠道码">
@@ -395,7 +395,7 @@
 				this.page = val;
 				this.dataSelectKm()
 			},
-			
+
 			handleSizeChangeY(val) {
 				this.size1 = val;
 				this.dataSelectYhq()
@@ -477,9 +477,9 @@
 					});
 					return
 				}
-				
-				
-				
+
+
+
 				if (this.titles == '添加') {
 					var url = 'couponCard/insertCouponCardType'
 				} else {
@@ -518,7 +518,7 @@
 							}
 						})
 					}
-					
+
 				})
 			},
 			//删除
@@ -698,7 +698,7 @@
 				 		'typeId': this.couponCardTypeId,
 						'num':this.num,
 						'sysUserId':this.sysUserId,
-						
+
 				 	})
 				 }).then(({
 				 	data
@@ -723,7 +723,7 @@
 				 			}
 				 		})
 				 	}
-				 
+
 				 })
 			},
 			// 卡密列表
@@ -750,6 +750,7 @@
 						'startTime': this.startTime,
 						'sysUserName':this.sysUserNameT,
 						'sysUserId':this.sysUserId,
+						'userId':this.sysUserId,
 					})
 				}).then(({
 					data
@@ -757,7 +758,7 @@
 					this.tableDataLoadingKm = false
 					let returnData = data.data;
 					this.tableDataKm = returnData
-					
+
 				})
 			},
 			// 详情跳转
@@ -780,7 +781,7 @@
 				this.dataSelectKm()
 				this.dialogFormVisibleKm = true
 			},
-			
+
 			// 导出
 			excelStair(){
 				// var endTime = this.endTime
@@ -800,7 +801,7 @@
 						'endTime': this.endTime,
 						'startTime': this.startTime,
 						'sysUserName':this.sysUserNameT
-				
+
 					})
 				}).then(({
 					data
@@ -859,7 +860,7 @@
 								}
 							})
 						}
-			
+
 					})
 				}).catch(() => {})
 			},
@@ -902,7 +903,7 @@
 			qudaoBtn(){
 				this.getDataList()
 				this.dialogFormVisibleQd = true
-				
+
 			},
 			getDataList() {
 				this.dataListLoading = true
@@ -932,7 +933,7 @@
 				this.sysUserName = row.username
 				this.dialogFormVisibleQd = false
 			},
-			
+
 		},
 		mounted() {
 			if(this.$cookie.get('sysUserId')&&this.$cookie.get('sysUserId')!='null'){

src/views/common/login.vue

@@ -187,9 +187,13 @@ export default {
       this.$http({
         // url: this.$http.adornUrl('app/Login/sendMsg/'+this.tableData.mobile+'/regis'),
         url: this.$http.adornUrl(
-          "app/Login/sendMsg/" + this.dataForm.mobile + "/regis"
+          "Login/sendMsg/" + this.dataForm.mobile + "/regis"
         ),
         method: "get",
+		params:{
+			phone: this.dataForm.mobile,
+			event:'regis'
+		}
       }).then((res) => {
         console.log(res);
         if (res.data.code == 0) {
@@ -251,7 +255,7 @@ export default {
               // this.$router.replace({ name: "home" });
             } else {
               // this.getCaptcha();
-              this.$message.error(data.msg);
+              this.$message.error(data.message);
             }
           });
         }
@@ -277,18 +281,27 @@ export default {
               this.$router.replace({ name: "home" });
             } else {
               this.getCaptcha();
-              this.$message.error(data.msg);
+              this.$message.error(data.message);
             }
           });
         }
       });
     },
     // 获取验证码
-    getCaptcha() {
+    async getCaptcha() {
       this.dataForm.uuid = getUUID();
-      this.captchaPath = this.$http.adornUrl(
-        `/captcha.jpg?uuid=${this.dataForm.uuid}`
-      );
+	  const res =await this.$http({
+		url: this.$http.adornUrl("indetcode/getCode"),
+			method:'get',
+			params:{
+				uuid:this.dataForm.uuid
+			}
+		})
+		console.log(res);
+		this.captchaPath=res.data.data.img
+    //   this.captchaPath = this.$http.adornUrl(
+    //     `/captcha.jpg?uuid=${this.dataForm.uuid}`
+    //   );
     },
   },
 };

src/views/finance/storeincome.vue

@@ -955,9 +955,13 @@ export default {
       this.$http({
         // url: this.$http.adornUrl('app/Login/sendMsg/'+this.tableData.mobile+'/regis'),
         url: this.$http.adornUrl(
-          "app/Login/sendMsg/" + this.tableData.mobile + "/regis"
+          "Login/sendMsg/" + this.tableData.mobile + "/regis"
         ),
         method: "get",
+		params:{
+			phone: this.tableData.mobile,
+			event:'regis'
+		}
       }).then((res) => {
         console.log(res);
         if (res.data.code == 0) {
@@ -1414,7 +1418,7 @@ export default {
         });
         return;
       }
-      // this.tableDataLoading1 = true
+      this.tableDataLoading1 = true
       let userId = this.$cookie.get("userId");
       this.$http({
         // url: this.$http.adornUrl('cash/cashMoney'),