diff --git a/src/api/wjnft/information.js b/src/api/wjnft/information.js
index c6c3c79..de85733 100644
--- a/src/api/wjnft/information.js
+++ b/src/api/wjnft/information.js
@@ -17,7 +17,7 @@ export function getInformation(id) {
   })
 }
 
-// 新增藏品信息 
+// 新增藏品信息
 export function addInformation(data) {
   return request({
     url: '/wjnft/information',
@@ -26,7 +26,7 @@ export function addInformation(data) {
   })
 }
 
-// 修改藏品信息 
+// 修改藏品信息
 export function updateInformation(data) {
   return request({
     url: '/wjnft/information',
@@ -35,10 +35,22 @@ export function updateInformation(data) {
   })
 }
 
-// 删除藏品信息 
+// 删除藏品信息
 export function delInformation(id) {
   return request({
     url: '/wjnft/information/' + id,
     method: 'delete'
   })
 }
+
+// 空投赠送
+export function airInformation(data) {
+  return request({
+    url: '/wjnft/information/donate' ,
+    method: 'post',
+    data:data
+  })
+}
+
+
+
diff --git a/src/api/wjnft/rotationmap.js b/src/api/wjnft/rotationmap.js
index 494d0ea..1fedecb 100644
--- a/src/api/wjnft/rotationmap.js
+++ b/src/api/wjnft/rotationmap.js
@@ -17,6 +17,14 @@ export function getRotationmap(id) {
   })
 }
 
+//微信访问二维码
+export function getWXRotationmap() {
+  return request({
+    url: '/wjnft/rotationmap/getQrCode' ,
+    method: 'get'
+  })
+}
+
 // 新增PC图片路径
 export function addRotationmap(data) {
   return request({
diff --git a/src/views/wjnft/brand/index.vue b/src/views/wjnft/brand/index.vue
index f248ce9..83b4728 100644
--- a/src/views/wjnft/brand/index.vue
+++ b/src/views/wjnft/brand/index.vue
@@ -218,6 +218,7 @@
             </el-upload>
 
           </div>
+          <span style="color: #C03639"> 需要上传三张图片 </span><br>
           <span> 上传文件只能是<b style="color: #C03639">png，jpeg，jpg</b >格式,大小不能超过<b style="color: #C03639">3M</b> </span>
           <el-dialog :visible.sync="dialogVisible">
             <img width="100%" :src="dialogImageUrl" alt="">
@@ -333,7 +334,7 @@ export default {
         // content: [ { required: true, message: '请输入内容' }],
         name: [{required: true, message: '请填写标题', trigger: 'blur'}],
         content: [{required: true, message: '请填写介绍', trigger: 'blur'}],
-        picture: [{required: true, message: '请选择图片', trigger: 'blur'}]
+        picture: [{}]
       },
     };
   },
@@ -498,6 +499,8 @@ export default {
           } else {
             if(this.pictureUrl.length > 1){
               this.form.picture = this.pictureUrl.join(",");
+            }else if(this.pictureUrl.length < 1){
+              this.$message.warning("请上传图片")
             }else{
               this.form.picture = this.pictureUrl[0];
             }
@@ -514,7 +517,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除入驻品牌编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除标题为"' + row.name + '"的数据项？').then(function() {
         return delBrand(ids);
       }).then(() => {
         this.getList();
diff --git a/src/views/wjnft/collection/index.vue b/src/views/wjnft/collection/index.vue
index b405ccd..38c5427 100644
--- a/src/views/wjnft/collection/index.vue
+++ b/src/views/wjnft/collection/index.vue
@@ -194,7 +194,7 @@
       <!--      <el-table -column label="作品系列表ID" align="center" prop="seriesId" />-->
       <el-table-column label="作品名称" align="center" prop="collectionName" />
       <el-table-column label="作品系列" align="center" prop="seriesName" />
-      <el-table-column label="价格(单位:元)" align="center" prop="price" />
+
 <!--      <el-table-column label="作品故事" align="center" prop="storyText" />-->
 <!--      <el-table-column label="作品故事图片" align="center" prop="storyPicture" />-->
 <!--      <el-table-column label="作品故事图片" align="center" prop="storyPicture" >-->
@@ -217,7 +217,7 @@
 <!--        </template>-->
 
 <!--      </el-table-column>-->
-      <el-table-column label="发行总数量" align="center" prop="issueNumber" />
+
 <!--      <el-table-column label="艺术家手机" align="center" prop="artistId" />-->
       <el-table-column label="作者名称" align="center" prop="artistName" />
       <el-table-column label="作家头像" align="center" prop="writerAvatar" >
@@ -281,6 +281,8 @@
       <!--          <span>{{ parseTime(scope.row.deletedTime, '{y}-{m}-{d}') }}</span>-->
       <!--        </template>-->
       <!--      </el-table-column>-->
+      <el-table-column label="价格(单位:元)" align="center" prop="price" />
+      <el-table-column label="发行总数量" align="center" prop="issueNumber" />
       <el-table-column label="剩余数量" align="center" prop="numberRemaining" />
       <el-table-column label="开售时间" align="center" prop="timeSale" width="180">
         <template slot-scope="scope">
diff --git a/src/views/wjnft/company/index.vue b/src/views/wjnft/company/index.vue
index d458aa7..6da610d 100644
--- a/src/views/wjnft/company/index.vue
+++ b/src/views/wjnft/company/index.vue
@@ -224,7 +224,7 @@ export default {
         // content: [ { required: true, message: '请输入内容' }],
         title: [{required: true, message: '请填写标题', trigger: 'blur'}],
         content: [{required: true, message: '请填写内容', trigger: 'blur'}],
-        picture: [{required: true, message: '请选择图片', trigger: 'blur'}]
+        picture: [{}]
       },
     };
   },
@@ -308,23 +308,34 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             console.log(this.form);
-            this.form.picture = this.global.apiUrl;
-            updateCompany(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.echo = false;
-              this.getList();
-            });
+            if(this.global.apiUrl === null){
+              this.$message.warning("请上传图片")
+            }else {
+
+              this.form.picture = this.global.apiUrl;
+              updateCompany(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.echo = false;
+                this.getList();
+              });
+            }
           } else {
            // console.log(this.global.apiUrl);
-            this.form.picture = this.global.apiUrl;
-           // console.log(this.form);
-            addCompany(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.echo = false;
-              this.getList();
-            });
+
+            if(this.global.apiUrl === null){
+              this.$message.warning("请上传图片")
+            }else{
+              // console.log(this.form);
+              this.form.picture = this.global.apiUrl;
+              addCompany(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.echo = false;
+                this.getList();
+              });
+            }
+
           }
         }
       });
@@ -332,7 +343,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除公司编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除标题为"' + row.title + '"的数据项？').then(function() {
         return delCompany(ids);
       }).then(() => {
         this.getList();
diff --git a/src/views/wjnft/information/index.vue b/src/views/wjnft/information/index.vue
index 4de927e..39a0bad 100644
--- a/src/views/wjnft/information/index.vue
+++ b/src/views/wjnft/information/index.vue
@@ -177,7 +177,7 @@
           prop="state"
           align="center"
           label="状态">
-        <template scope="scope">
+        <template slot-scope="scope">
           {{ scope.row.state === 0 ? '未出售': '' }}
           {{ scope.row.state === 1 ? '已出售': '' }}
         </template>
@@ -194,24 +194,25 @@
 <!--          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['wjnft:information:edit']"-->
-<!--          >修改</el-button>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+              v-if=" scope.row.state === 0"
+            size="mini"
+            type="text"
+            @click="paradrop(scope.row)"
+            v-hasPermi="['wjnft:information:edit']"
+          >空投</el-button>
 <!--          <el-button-->
+<!--            v-if=" scope.row.state === 1"-->
 <!--            size="mini"-->
 <!--            type="text"-->
 <!--            icon="el-icon-delete"-->
 <!--            @click="handleDelete(scope.row)"-->
 <!--            v-hasPermi="['wjnft:information:remove']"-->
-<!--          >删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+<!--          >转赠</el-button>-->
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -222,6 +223,19 @@
       @pagination="getList"
     />
 
+    <!-- 空投操作 对话框 -->
+    <el-dialog :title="title" :visible.sync="airDrop " width="550px" append-to-body>
+      <el-form ref="air" :model="air" :rules="rules" label-width="140px">
+        <el-form-item label="被赠送人电话号码" prop="airPhone">
+          <el-input v-model="air.airPhone" placeholder="请输入被赠送人电话号码" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="subParDrop" :disabled="stepLoading">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
     <!-- 添加或修改作品信息 对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -283,12 +297,16 @@
 </template>
 
 <script>
-import { listInformation, getInformation, delInformation, addInformation, updateInformation } from "@/api/wjnft/information";
+import { listInformation, getInformation, delInformation, addInformation, updateInformation ,airInformation } from "@/api/wjnft/information";
 
 export default {
   name: "Information",
   data() {
     return {
+      //空投对话框
+      airDrop:false,
+      airDropId:null,
+      stepLoading: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -325,6 +343,11 @@ export default {
       },
       // 表单参数
       form: {},
+      // 表单参数
+      air: {
+        //被空投人电话
+        airPhone:null
+      },
       // 表单校验
       rules: {
         collecyionId: [
@@ -336,6 +359,7 @@ export default {
         currentNumber: [
           { required: true, message: "当前作品编号不能为空", trigger: "blur" }
         ],
+        airPhone:[{required: true, message: '赠送人电话不能为空', trigger: 'blur'}]
       }
     };
   },
@@ -355,6 +379,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.airDrop = false;
       this.reset();
     },
     // 表单重置
@@ -373,6 +398,7 @@ export default {
         updatedBy: null,
         updatedTime: null
       };
+      this.air.airPhone = null;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -406,6 +432,44 @@ export default {
         this.open = true;
         this.title = "修改作品信息 ";
       });
+    },
+    /** 空投按钮操作 */
+    paradrop(row) {
+      this.reset();
+      this.airDropId = row.id ;
+      this.airDrop = true;
+      this.title = " 赠送 ";
+    },
+    /** 空投提供按钮 */
+    subParDrop(){
+
+      // this.$message({
+      //   message: '添加步骤成功',
+      //   type: 'success',
+      // });
+      this.stepLoading = true;
+      if(this.air.airPhone === null ){
+        this.$message.warning("请输入电话号码！")
+        this.stepLoading = false;
+      }else{
+        this.airDrop = false;
+        setTimeout(() => {
+            let num ={
+              airDropId : this.airDropId,
+              airPhone : this.air.airPhone,
+            }
+          airInformation(num).then(()=>{
+            this.getList();
+          });
+          this.stepLoading = false;
+        }, 1000);
+      }
+
+
+
+
+
+
     },
     /** 提交按钮 */
     submitForm() {
diff --git a/src/views/wjnft/order/index.vue b/src/views/wjnft/order/index.vue
index ddaab56..1e68001 100644
--- a/src/views/wjnft/order/index.vue
+++ b/src/views/wjnft/order/index.vue
@@ -130,6 +130,7 @@
           <span v-if="scope.row.transactionType === '11'">抢购</span>
           <span v-if="scope.row.transactionType === '12'">转赠</span>
           <span v-if="scope.row.transactionType === '13'">二手买卖</span>
+          <span v-if="scope.row.transactionType === '14'">赠送</span>
           <span v-if="scope.row.transactionType === '19'">其他</span>
         </template>
       </el-table-column>
diff --git a/src/views/wjnft/rotation/index.vue b/src/views/wjnft/rotation/index.vue
index 577465b..f4bcb56 100644
--- a/src/views/wjnft/rotation/index.vue
+++ b/src/views/wjnft/rotation/index.vue
@@ -369,7 +369,8 @@ export default {
         // content: [ { required: true, message: '请输入内容' }],
         identification: [{required: true, message: '请选择类别', trigger: 'blur'}],
         content: [{required: true, message: '请填写内容', trigger: 'blur'}],
-        rotationId: [{required: true, message: '请选择图片', trigger: 'blur'}],
+        // rotationId: [{required: true, message: '请选择图片', trigger: 'blur'}],
+        rotationId: [],
         advertising: [{required: true, message: '请选择活动类型', trigger: 'blur'}]
       },
     };
@@ -607,23 +608,33 @@ export default {
             });
           } else {
            // console.log(this.global.apiUrl+"serytws er");
-            this.form.rotationId = this.global.apiUrl;
-            console.log(this.pictureUrl.length);
-            if(this.pictureUrl.length < 1 ){
-              console.log(this.form);
-              addRotation(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.echo = false;
-                this.global.apiUrl = null;
-                this.pictureUrl =[];
-                this.$refs.uploadFile.$refs.upload.clearFiles();
-                this.$refs.upload.clearFiles();
-                this.getList();
-              });
+            console.log(this.global.apiUrl+"============================");
+            if(this.global.apiUrl === null){
+              this.$message.warning(" 请上传图片")
             }else{
-              if(this.pictureUrl.length === 4 ){
-                this.form.advertising = this.pictureUrl.join(",");
+              this.form.rotationId = this.global.apiUrl;
+              console.log(this.pictureUrl.length);
+
+              if( this.hide ){
+                //需要广告图片
+                if(this.pictureUrl.length === 4 ){
+                  this.form.advertising = this.pictureUrl.join(",");
+                  console.log(this.form);
+                  addRotation(this.form).then(response => {
+                    this.$modal.msgSuccess("新增成功");
+                    this.open = false;
+                    this.echo = false;
+                    this.global.apiUrl = null;
+                    this.pictureUrl =[];
+                    this.$refs.uploadFile.$refs.upload.clearFiles();
+                    this.$refs.upload.clearFiles();
+                    this.getList();
+                  });
+                }else{
+                  this.$message.warning("上传广告图片需要4张，请添加")
+                }
+              }else{
+                //不需要广告图片
                 console.log(this.form);
                 addRotation(this.form).then(response => {
                   this.$modal.msgSuccess("新增成功");
@@ -635,23 +646,26 @@ export default {
                   this.$refs.upload.clearFiles();
                   this.getList();
                 });
-              }else{
-                this.$message.warning("上传广告图片需要4张，请添加完成")
               }
+
             }
 
 
+
           }
         }
       });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+
+      this.valuation(row.identification);
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除pc端轮播图编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除类型为"' + this.form.identification + '"的数据项？').then(function() {
         return delRotation(ids);
       }).then(() => {
         this.getList();
+        this.form.identification = null;
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
diff --git a/src/views/wjnft/rotationmap/index.vue b/src/views/wjnft/rotationmap/index.vue
index 5df9904..2ce9733 100644
--- a/src/views/wjnft/rotationmap/index.vue
+++ b/src/views/wjnft/rotationmap/index.vue
@@ -1,147 +1,178 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="类别" prop="state">
-        <el-input
-          v-model="queryParams.state"
-          placeholder="请输入类别"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="图片路径" prop="picture">
-        <el-input
-          v-model="queryParams.picture"
-          placeholder="请输入图片路径"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createdTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.createdTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updatedTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.updatedTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择更新时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="删除时间" prop="deletedTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.deletedTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择删除时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['wjnft:rotationmap:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['wjnft:rotationmap:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['wjnft:rotationmap:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['wjnft:rotationmap:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
-    <el-table v-loading="loading" :data="rotationmapList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="类别" align="center" prop="state" />
-      <el-table-column label="图片路径" align="center" prop="picture" />
-      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="删除时间" align="center" prop="deletedTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.deletedTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['wjnft:rotationmap:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['wjnft:rotationmap:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+
+    <h1>微信扫码登录方式一</h1>
+
+    <el-button @click="getQrCode()" style="width: 100px;height: 50px;">获取二维码</el-button>
+
+    <br>
+    <div class="demo-image">
+      <div class="block">
+        <el-image
+            style="
+            width: 150px;
+            height: 151px;
+            border-radius: 6px;
+            z-index: 2;
+          "
+            :src="qrCodeImgId"
+        >
+        </el-image>
+      </div>
+    </div>
+
+<!--    <el-image :src="qrCodeImgId"  style="width: 300px;height: 300px;display: none"></el-image>.-->
+    <hr>
+    <h1>微信扫码登录方式二</h1>
+<!--    <button @click="toQrCode()" style="width: 100px;height: 50px;">获取二维码</button>-->
+
+
+
+<!--    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">-->
+<!--      <el-form-item label="类别" prop="state">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.state"-->
+<!--          placeholder="请输入类别"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="图片路径" prop="picture">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.picture"-->
+<!--          placeholder="请输入图片路径"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="创建时间" prop="createdTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--          v-model="queryParams.createdTime"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="选择创建时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="更新时间" prop="updatedTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--          v-model="queryParams.updatedTime"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="选择更新时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="删除时间" prop="deletedTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--          v-model="queryParams.deletedTime"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="选择删除时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item>-->
+<!--        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
+<!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
+<!--      </el-form-item>-->
+<!--    </el-form>-->
+
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['wjnft:rotationmap:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['wjnft:rotationmap:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['wjnft:rotationmap:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['wjnft:rotationmap:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
+
+<!--    <el-table v-loading="loading" :data="rotationmapList" @selection-change="handleSelectionChange">-->
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+<!--      <el-table-column label="id" align="center" prop="id" />-->
+<!--      <el-table-column label="类别" align="center" prop="state" />-->
+<!--      <el-table-column label="图片路径" align="center" prop="picture" />-->
+<!--      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="删除时间" align="center" prop="deletedTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.deletedTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['wjnft:rotationmap:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['wjnft:rotationmap:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--    </el-table>-->
+
+<!--    <pagination-->
+<!--      v-show="total>0"-->
+<!--      :total="total"-->
+<!--      :page.sync="queryParams.pageNum"-->
+<!--      :limit.sync="queryParams.pageSize"-->
+<!--      @pagination="getList"-->
+<!--    />-->
 
     <!-- 添加或修改PC图片路径对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -186,12 +217,13 @@
 </template>
 
 <script>
-import { listRotationmap, getRotationmap, delRotationmap, addRotationmap, updateRotationmap } from "@/api/wjnft/rotationmap";
+import { listRotationmap, getRotationmap, delRotationmap, addRotationmap, updateRotationmap ,getWXRotationmap } from "@/api/wjnft/rotationmap";
 
 export default {
   name: "Rotationmap",
   data() {
     return {
+      qrCodeImgId:null,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -231,6 +263,50 @@ export default {
     this.getList();
   },
   methods: {
+
+    //======================================微信扫码登录方式一=========================================================
+    // 存储二维码标识,用于验证是否扫码成功
+    // 获取登录二维码
+  getQrCode(){
+
+
+   getWXRotationmap().then(data => {
+     console.log("=============getQrCode=======================");
+     console.log(data);
+     if(data.code == 200){
+      let sceneStr = data.data.sceneStr;
+      this.qrCodeImgId = "https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket="+data.data.ticket;
+       // $('#qrCodeImgId').attr('src',"https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket="+data.data.ticket);
+     }else{
+       alert(data.msg);
+     }
+    })
+    console.log("=============getQrCode=======================");
+
+
+
+},
+
+// 扫码成功，获取用户openId=>为获取用户信息做准备
+getOpenId() {
+  $.get("qrCodeFirstLogin/getOpenId",{
+    "eventKey":sceneStr
+  },function (data) {
+    if(data.code == 200){
+      console.log("========getOpenId==========");
+      console.log(data.data);
+      window.clearInterval(t);
+      alert("登录成功openId："+data.data.openId);
+      /**
+       * 1、第一次扫码登录进行账号绑定
+       * 2、以后根据openId获取用户信息
+       */
+    }
+  });
+},
+
+
+
     /** 查询PC图片路径列表 */
     getList() {
       this.loading = true;
diff --git a/src/views/wjnft/us/index.vue b/src/views/wjnft/us/index.vue
index 2586925..def0613 100644
--- a/src/views/wjnft/us/index.vue
+++ b/src/views/wjnft/us/index.vue
@@ -336,7 +336,7 @@ export default {
         content: [{required: true, message: '请填写内容', trigger: 'blur'}],
         address: [{required: true, message: '请填写元宇宙地址', trigger: 'blur'}],
         addressCooperation: [{required: true, message: '请填写合作公司地址', trigger: 'blur'}],
-        pictureUrl: [{required: true, message: '请选择图片', trigger: 'blur'}],
+        pictureUrl: [{}],
         choiceOne: [{required: true, message: '请填写选择我们的原因', trigger: 'blur'}],
         choiceTwo: [{required: true, message: '请填写选择我们的原因', trigger: 'blur'}],
         choiceThree: [{required: true, message: '请填写选择我们的原因', trigger: 'blur'}]
@@ -372,9 +372,9 @@ export default {
           if(picture.search(",") != -1){
            // console.log(item.pictureUrl)
             let e = picture.split(",");
-            console.log(e)
+            //console.log(e)
             e.forEach( items => {
-              console.log(items)
+             // console.log(items)
               if(items !== undefined || items !== ' '){
                 item.pictureUrl = items;
                 this.srcList.push(items);
@@ -438,8 +438,14 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.open = true;
-      this.title = "添加关于我们";
+      //console.log(this.usList )
+      if(this.usList.length > 0){
+        this.$message.warning("当前内容已添加，请修改需要改动的消息！");
+      }else{
+        this.open = true;
+        this.title = "添加关于我们";
+      }
+
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -536,8 +542,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      console.log(row);
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除关于我们编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除标题为"' + row.title + '"的数据项？').then(function() {
         return delUs(ids);
       }).then(() => {
         this.getList();